DO NOT MERGE - Merge tm-qpr3-release TQ3A.230605.010 into tm-platform-merge Bug: 279962103 Change-Id: Ic009807cd6b4689ee88a0facb391caa321c4454f