Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump required Bazel version to 2.1.0

Change-Id: I7dc85c07cf171e3c2520ee9b3f4d62e1fb7904c4