Merge UP1A.231005.007

Bug: 291102124
Merged-In: Idcbd0f2ba87290f090d693f0a64cb46fe8270b95
Change-Id: I64a40b9b56d5b18f8423d53abb5c1ba4429d5037