Merge TQ2A.230405.003

Bug: 271343657
Merged-In: Iea66d7782b3365dea827b854783aeddaa5c6699c
Change-Id: I3d68fee0bc2be65b51b7c49923a2dcf4da630acd