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

Bug: 279962103
Change-Id: I34564a53ff68ba7c37312175425271b1dbe2d1d2