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

Change-Id: I019805d68c3bb17be8eda7c0c22ac80c28ff57fc