Merge TQ1A.221205.012

Bug: 255404110

Merged-In: Ie9c62c0ee81086801942328c8770f37d5bf622c3
Change-Id: Idcdacb61af6501d7de45b725534fb227846262f7