Add OC support

Change-Id: Ic9806bec7627cf109b4bf2945e01add3187c176c