Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 3.7.0

Change-Id: I3533c23cba5631893d88f119fe413752c5222f8e