Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I46f37b7c6c3cd3dd95b718a1e09ef0f536e95ffe