Merge UQ1A.231205.015

Bug: 308969284
Merged-In: I4151fb683b0df25a3bf0070ef71c90ba29ebf7cc
Change-Id: I2d4fb2b0ffd144e3e4eba61d39c5638a7f55ab73