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

Change-Id: I429f077183b4815042c7bfd5661652007eff6b20