Default oc adjucments

Change-Id: I34e3bedb1ccd3c788a942a3a50ca0df448b38f84