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

Change-Id: Ic6cc452dcb7c0b3a2fca45d4076c5eba8a4250d6