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

Bug: 279962103
Change-Id: I60464a3c617bf0fb078d3636f4a1834e9eb782a5