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