Merge TQ2A.230405.003

Bug: 271343657
Merged-In: Ibd8d3c3c34b91657327903e1063351448722e41c
Change-Id: I6465078fcca24769a710ff2ba0f4ca93b80fb44c