Merge "Remove null-ptr deref compiler warning."
am: b4d217ed0f

Change-Id: Iaa009b250224afa46e7220c44054ae1755d897bd