Merge "Revert "Fix "Dereference of null pointer" compiler warning.""
am: edbb04f4a0

Change-Id: If5663f47601e0910c34fd0e50ceb682dcaf5ff7c