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