Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I82fa34af8c4167951c50c9b3d1db3eae156b6981