Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I126fc8311fea4165c6ddd5fca3158efbb22779fc