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