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

Bug: 279962103
Change-Id: I4134853e45db5a12d64f84c65d03563fe1c9cef7