Merge UP1A.220630.002

Change-Id: I3c870b6564d05a8208c28d51189210ae78f700b2