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