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

Change-Id: Ieb93edf167a158a1f1759c6ffc6f492eac0b4144