Resolve uprev conflict

Change-Id: I957b0660027e7b49929745404953c8ce14ce9549