Merge branch 'stable-3.2' into master

* stable-3.2:
  Bump Bazel version to 3.7.0

Change-Id: If6288f6febb3dfa488112502390de6cf33d5e912