Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: I627731665cd23d28c3e925d01aca45fe3ec07097