Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: Id19436efa8511a5586f0bc147e681b2d695d657c