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