Resolve uprev conflict

Change-Id: Ifa3986cf45014df1c9691e485de9a6aae76e7ecd