Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.5.0

Change-Id: Icd15e2e9667d74df085bf459925ce63cd8274850