Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I7e9ee20843e868c29b22d26fd817889633d91c25