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

Bug: 279962103
Change-Id: I37841dd232f6989a5536fe1ccb93c1f9faec5b42