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

Bug: 279962103
Change-Id: I056af74af78f17416031b3cf233c5ccb8ec550c8