Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: I75066c7c9847848c78ca62cfd03d736e28a76dca