Merge UQ1A.231205.015

Bug: 308969284
Merged-In: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf
Change-Id: I455d7c3e6ae8dd9d7618410843ed4b488289ac41