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

Bug: 279962103
Change-Id: I46f8d17d6be277cbb9e7b6d5049b96fed43f05f7