Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump required Bazel version to 2.1.0

Change-Id: Idbc2ec7737d45f24295e98032157855b9bfb2712