Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I212a74b8a8a0add5a226d5016246c525cde567e2