Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I90d6f74a0ef796d0264957570e0c8c1eec2b1126