Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: If4f7fbeafbeab83e4d45f7bb1c998d5aae5c8fdc