Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I50a3629fb46e0a6fcb85141f77725f55f7f5a881