Resolve uprev conflict

Change-Id: I726995fccbcfd9d95005163b6ed65c93e38a3c03