Resolve uprev conflict

Change-Id: I1b44d1566525f0db4eca1c062948750d3b09fda2