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