Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.0.0

Change-Id: I1e80fccc925e37a04303409b3d9207ced18034cc