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

Bug: 279962103
Change-Id: I3da3bf9d3fb27955dd9071c0151b4b8eed40abb4