Merge UQ1A.231205.015

Bug: 308969284
Merged-In: Id0d634a3055e3acf39162f89917da828a5c27122
Change-Id: I3367a2fcabd19f42daf0ef0cccd6bf8089c47dc5