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

Change-Id: I0cbb8174d73ef374a6f73988250f477502dc5c80