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

Change-Id: I3c81e5f426d6f4e41914b5f35803dd35ccc47710