Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: If56d7d99d71c6729a701459bb4c770b955799ab1