Resolve uprev conflict

Change-Id: I7f9f937655f82f8feb99184738f116da27c30aa3