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