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

Change-Id: I30a0ba602d88d9457a07997cab1d1ea1882de572