Merge "Removed test from presubmit." into oc-dev