Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: Ia92ccc56ae430abbb78c17fb8a4fcd6e11393000