Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump required Bazel version to 2.1.0

Change-Id: I42ce69ad62f298e5aa301fe0a073c9de6fd1217f