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

Bug: 279962103
Change-Id: I34e4c00ef8a6715e6fd6f296f336a3dbfd5d2919