Resolve uprev conflict

Change-Id: I19a0a29561e97a69858055ec2a62628e30ed5fb8