Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.0.0

Change-Id: I30bab89e00fd40081ef6da6614c1181237728d33