Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: If5b85b270675b7dc3aed9d7fc490ff542f94c139