Merge TQ2A.230405.003

Bug: 271343657
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
Change-Id: Ib47a648d9e431f09196d292083abd570d33dcd50