Merge TQ2A.230405.003

Bug: 271343657
Merged-In: Iddb8619be7bdd9767211e44913e8ba3871bc6580
Change-Id: Ia02a1c751784f56264360e1a8791df072bd5b197