Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.2.0

Change-Id: I2aebae56dba1c5cba47ae131ef361881d252ac4f