Merge UP1A.231005.007

Bug: 291102124
Merged-In: I065d361b83700474a1efab2a75928427ee0a14ba
Change-Id: Id4f6a4f6149e81df76f5fca515823cb552de875d