Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 3.5.0

Change-Id: I436423755473c2fecb3f5cc439b7c1c9d14ae9b3