Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I05ce8702f4ba5e27f4729813eec2877a1cef6bc8