Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 3.7.0

Change-Id: Ieebc313ae20d12e9fa8cb7e9001ae548b7a103d1