Merge "null check before dereference" into oc-dev
am: df8569787c

Change-Id: I62067d87f75367bb527862d3ac3873b3c94c9b7c