Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.4.1

Change-Id: I0331129fb8c8b47decc3c9933a2cb501423387ab