Merge "Merge "null check before dereference" into oc-dev am: df8569787c am: b5af86e444" into oc-dr1-dev-plus-aosp