Merge TQ1A.221205.012

Bug: 255404110

Merged-In: I651d1ff64d06b4c30e18ee69772f52a60aa5ff7a
Change-Id: Ieec60a4acac4036c28d3e654eede54240a515125