Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Bump Bazel version to 3.4.1 e2e-tests: Replace hardcoded scheme with property Change-Id: I6f0d68b658e18ae05a133602fcaf0b2b9864616e