SOKPify part 2

Change-Id: Ia0fdc6d8c42d010a0ebdd4e19e453d14ba077b89