tree b46587f2adedaa1be511990fa324f88cb93791d8
parent 509a29f8a0f60772e0f7dfddf00b39007f8ddbeb
parent b94122d92e9044332bef64ab1791f10575973da7
author Les Lee <lesl@google.com> 1637023538 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1637023538 +0000

Merge "Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev am: ae28e40017" into sc-v2-dev