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

Change-Id: Id354cb3d1df430a9e4994c25f1441f510707e3bf