Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I96d3e2e5def82859db6661dc37ac7980f15c2abc