Merge UQ1A.231205.015

Bug: 308969284
Merged-In: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe
Change-Id: I7a1fec0331c5bddabd4f9edabcfda9b137f7a452