Merge UP1A.230905.019

Merged-In: I1b80b8ad427d8a0d2a6d967b98b89d808c549527
Change-Id: Ia94eacfd3db131d1deb86a857945119a80863bbe