Merge UQ1A.231205.015

Bug: 308969284
Merged-In: I7ec4144b29ed10f1afc2df4fc264628394c7b164
Merged-In: Ie07d98e60264fb9ec67eff98acd74483ee267438
Change-Id: I87c8910b8b45ea75b3455defd0024ff68c2cdd0b