Resolve uprev conflict

Change-Id: Ia2806e0d8a9373edf6bc442209bec170a0e4d2f5