Merge "Fix bug with smaller width bigger size" into main
authorJerome Jiang <jianj@google.com>
Fri, 1 Jul 2022 14:37:32 +0000 (14:37 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 1 Jul 2022 14:37:32 +0000 (14:37 +0000)

Trivial merge