Merge TQ2A.230405.003

Bug: 271343657
Merged-In: I6e17d5d7a598fb01f3bf75f2df88d63d187231d9
Change-Id: I86b6784923febdab6d807c681b3ffe0b6053b70e