Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: Ife0b1ae5b31106ee4ccd67f4c8bccf5ddd01ebf2