Merge TQ2A.230405.003

Bug: 271343657
Merged-In: I7795abe0aebefca2d42998a672abfd12f951d501
Change-Id: I9c1577c5b5a389d5ec83d5edd8b88ff1f5b3d64e