SOKPify

Change-Id: Ie010dbaff0372fe668c3e3209956c8fc3f1a2dcb