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

Change-Id: I1e7127b2611649740eddaee7a4a8705ec06de406