DO NOT MERGE - Merge tm-qpr3-release TQ3A.230605.010 into tm-platform-merge

Bug: 279962103
Change-Id: Ibe497bde51ce4f38dfe3d1c473a64d2cef0c0e90