Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.4.1

Change-Id: I49c5957d8839d3959659463af789c0453f9fcfbb