Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I22243a8bb3b412d03052acd1a34e988d3bbefdab