Merge branch 'stable-3.1' * stable-3.1: Bump Bazel version to 3.5.0 Change-Id: Ib83d130961d9ac64ffdffff24690d3e6527cfb69