Merge "Speculative fix for missing target crash" into oc-mr1-dev am: a6aafa33ec
am: e188aa84ef

Change-Id: I952357aa76aca5bb6f90d427ddf3d4d5d38f06fe