Merge UP1A.231005.007

Bug: 291102124
Merged-In: Ib39ba935727df0bc1ab4030bcfe8301de7e64805
Change-Id: Ic96a1854bcb1071da9b3eebdf3a63fe17d5c9c6f