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

Change-Id: I9867cce02601d139893edef2c2cc6f89da1d74a9