Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.2.0

Change-Id: I57b879869bab4d08fc537fdeb86a5b919db7f557