Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I9799f090900e44aede751ac2bc84d0d61c24f89b