Merge branch 'stable-3.1'

* stable-3.1:
  Bump Bazel version to 3.5.0

Change-Id: Icb9651fe0048fbc72885198683eddc7b6c67bf0c