Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.5.0

Change-Id: I2ad1a1a28f3f40d037d91033b7786791a2c36189