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

Change-Id: I41f9298e305f6f197120f2b3128187a4cbf6b28a