Merge UQ1A.231205.015

Bug: 308969284
Merged-In: I403e87cf5943f5c45d6d0db99a3e15018064067a
Change-Id: Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305