Resolve uprev conflict

Change-Id: Id922d0e973b89f0497802af1fadd7d0268866ba8