Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I8336b0bec173a6621aaabaad94e273b524cd009c