DO NOT MERGE - Merge tm-qpr3-release TQ3A.230605.010 into tm-platform-merge Bug: 279962103 Change-Id: Id0c584d84d775e4ffddc9a7e4a149b1d0bda1ccf