Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I0c9a6f055b115043c750779616bebdd4a3f34b8f