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

Bug: 279962103
Signed-off-by: Andy Quan <andyq@google.com>
Change-Id: Iedad375f0aca44fb0bd6ec0bd52cc44a9c302478