Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump required Bazel version to 2.1.0

Change-Id: I6902f208ba50509789fde760cc1fb094d2718d90