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

Change-Id: I48191b693fac40513b670c711afea568eafe1ebf