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

Bug: 279962103
Change-Id: Ibdbd5f25b35b0943e8a57498e60d7e75ca738244