Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: Ia35537b684fa871f5e31d6a03c001d7f1377d517