Merge UP1A.231005.007

Bug: 291102124
Merged-In: I02c6f67e9f820e6b895f7bdc9bc483ca43e267d7
Change-Id: I5c8ce170065ef8b12c98b259adcb9dd6f1e0cc92