Merge "Merge "Fix missing null checking" into oc-mr1-dev am: 93d436f4bc" into oc-mr1-dev-plus-aosp