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

Change-Id: I9f2b25bf6f45a711b1cf18ca473a1f545ceb7cef