Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I1a739e8adbb5ae8264005a32c9daaf50880fff71