Merge TQ1A.221205.012

Bug: 255404110

Merged-In: Id2b5dcfb5d8f72c0003979262911ab5b8665a060
Change-Id: Ided03f35ef57e66f667a18eff75998c00409723c