Merge "Fix missing null checking" into oc-mr1-dev
am: 93d436f4bc

Change-Id: Ib0a68cdf2d45141895191b7e2250ab0505c5a7ea