Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I9a83cccdbe63055906c44cd4a30b6b809fc4dcc9