Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Bump Bazel version to 3.5.0 Change-Id: I0325f9fa877671d73e440fd7112f450a4c426bf7