Merge branch 'stable-3.1' * stable-3.1: Bump Bazel version to 3.5.0 Change-Id: I9e64bf5cd9a924070c03ceaa98d7a0fbad46cb8d