Merge TQ2A.230405.003

Bug: 271343657
Merged-In: I46ec45354ae72a6a758aba2c2a31af92f1da4038
Change-Id: I2222e003c0ffe38ca39f9ff9d779644f09389d2f