Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I492f4d99013756ced945c7e9322b9cd928ad9ed3