Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.4.1

Change-Id: I227cf8c4b45e2dde130c33668ca9e932e73bf4fb