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

Change-Id: I9be94377b57340e5e4bbcdecacd009eae0324bdd