Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 3.5.0

Change-Id: Id7900779de829e72fd0be75ecb7895a852b73c23