Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.2.0

Change-Id: I2c2900480eb4f8d8e29f5ea98132ade0a036265e