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

Change-Id: Id44a81a44df376ebcaa9efd229b78328d8eaa5ac