Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump required Bazel version to 2.1.0

Change-Id: I558de9c3f875e1c2cb2940c6f63e0e3f2884e0d3