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

Change-Id: I1e6ba0f17b816abebb0184038de15754a660c68a