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

Change-Id: Ifa868b17837796dec93c93119260a92f4241f624