Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.2.0

Change-Id: I0c2395856f3ef8552586c208e97734f5f360df43