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

Change-Id: Ibbad678396e7fc3c80d2c3a5cd2c70cb2868e49c