Merge "Fix presubmit tests" into oc-mr1-dev