Merge UP1A.230905.019

Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: I130465c5f31cededa1edc540123d83c6dedc9487