Enable OC by default

Change-Id: I9ffa3a6b0cff7546ab59895e2605142464f2d0d3