Merge UP1A.231005.007

Bug: 291102124
Merged-In: I4dbb4f1a44fdfdaa1b5e8bf6d130c9e0369bb50d
Change-Id: I883bf1802dc3781530219b6a9e47e95c516c7bf2