Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: I209e37aeaee8f43c5c8eeb40045e16e8c759e14e