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