Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I25b03e9d12c062f546155f15b9966efa5b3b2769