Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump required Bazel version to 2.1.0

Change-Id: I25f165fb71c9ba30be22785b1752bb2fd9331c4a