Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.5.0

Change-Id: I1bcf9b49fc2b54565981f178b9bf75adb4fe65a6