Resolve uprev conflict

Change-Id: I0fec80228f801f07aa2317f1bfca6065666100fd