No OC, no problem

Change-Id: I3276275350dfbab077d77df4c3fc70fec8ef3097