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