Merge branch 'stable-3.0'

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: I1a7d1b0049589b3e602a7db1ea677650cacafe8d