Merge UQ1A.231205.015

Bug: 308969284
Merged-In: I91dd8b4088f02af9dc5e603853d8e26606acc38f
Change-Id: I7f5bca7edd18631b36f2b9213e17554cf769cbc6