Merge TQ2A.230405.003

Bug: 271343657
Merged-In: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df
Change-Id: Id9f3355ef5381b7e43d62e878e56f7d8906ea3cd