Merge "Add a missing null check" into oc-dev am: 101fca656d
am: ea99954804

Change-Id: If4d45586afd4dde05a3aad10d25f73afdcc3e92d