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

Bug: 279962103
Change-Id: I024af1d6d8df58e3c38008b266b8abd4e3cd069c