Resolve uprev conflict

Change-Id: Ic702fc889fce15717a31389b9abf23a3c41fdd6a