Resolve uprev conflict

Change-Id: I797257e95b4058af9c662ace1dc9eeb27b71d4c9