Merge UQ1A.231205.015

Bug: 308969284
Merged-In: I87fd24ba084691c238f5c07272208049acaf2e5d
Change-Id: I17fe20380b327b4af1734a761bac585fa5d16eaf