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

Bug: 279962103
Change-Id: I36c26d9dc587fba54330eb651d1cf3068c6eebb6