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

Bug: 279962103
Change-Id: I822e59af527ad263ec8dfa9e213db4dd8c83522c