Merge UQ1A.231205.015

Bug: 308969284
Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e
Change-Id: I3b4d08e3a3fd62a4887a518e9ad93294700693b3