Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.0.0

Change-Id: I7d63b259a0fd0e6de80bb02ca908459d8d3b6459