Resolve uprev conflict

Change-Id: I7a674ee1f132475a533766985ebe3ec29f5b0705