Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: Ie244f5a29b23511a6ea45b4e104fff57310db4d7