Merge "Add nullptr check" into oc-mr1-dev
am: b20694ab00

Change-Id: I090a1d0a4f0b2b5ec8c599d795995ea242c2a6ca