Merge TQ2A.230405.003

Bug: 271343657
Merged-In: I8acb3306d89fcc48bb2f435663e2736c92436227
Change-Id: I016c0d73dfd1e708410bb4000de35163bb6e453a