Merge UP1A.231005.007

Bug: 291102124
Merged-In: Id90e8e728cc3e2ccf7d92148fbb0d6ff3e6fd6ca
Change-Id: Ib512ae38486a5c225bc0b3faa3ffcbbbcdd4d984