Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.4.1

Change-Id: I64da8805b93f09d0a9582530c709e13f8d2541bb