Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 3.5.0

Change-Id: I93bc68569fd36eba372f5769ac506aefc0ad6f75