Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.0.0

Change-Id: I94666b4f6f2f839d833891c540e819728256092d