Merge "Merge tag 'v1.12.0' into main" into main
authorJerome Jiang <jianj@google.com>
Tue, 28 Jun 2022 22:59:24 +0000 (22:59 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 28 Jun 2022 22:59:24 +0000 (22:59 +0000)

Trivial merge