Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 3.5.0

Change-Id: I8b1699fe91d915e66013b551747d3796f0b272cf