Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump required Bazel version to 2.1.0

Change-Id: I0383195ad52b55dbd8e825f9ff23ca6bceb99395