Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.4.1

Change-Id: Ie084342b94ca3ab249f0270bd196386e42cc70b7