Merge UP1A.231005.007

Bug: 291102124
Merged-In: If36958e9ed2e9423b9c67ac635c9a7f65469e917
Change-Id: I07ab3884c2b8d9c4dab376ee31b7630d1a0633ea