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

Bug: 279962103
Change-Id: I231c9b3ebc62d36fe9fb1e78c4e92d0da4ce7b04