Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.5.0

Change-Id: Ifa61dd0510a3a3b1c6c8106c768bd7bf4f28110c