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

Bug: 279962103
Change-Id: I5656b1b18d5d6b897a9ae91a9ffeb4cc4676858f