Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.4.1

Change-Id: I930ef11c066925977a138792bb0e1846d78e27cd