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

Bug: 279962103
Change-Id: Ifc474e4f67bfc33e1725723a5d241fe14b5be989