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

Change-Id: I30c5f2f7b27fb4f35991082bcff5c8995fbcdd75