Resolve uprev conflict

Change-Id: I914b773a49dc59cea7f132fd5b1c483f32eeb056
1 file changed