Merge TQ1A.221205.012

Bug: 255404110

Merged-In: Ib19afd740e10d8bc26fc173641f7463719d079fd
Change-Id: I1fee9c49a3c978ad9af640d36ac409f987a468c0