Merge "Merge "null check before dereference" into oc-dev am: df856978 am: b5af86e4" into oc-dr1-dev-plus-aosp