Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump required Bazel version to 2.1.0

Change-Id: Id2baed443dc1e37c26dd6f714beb92184812791a