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

Bug: 279962103
Change-Id: I7998cba726de0c2ef6d9e5fbddacab0b68fb0931