Merge "Merge "Add a missing null check" into oc-dev am: 101fca656d am: d56b01e022" into oc-dr1-dev-plus-aosp