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

Change-Id: Ie4ee8c1462415b89c96e3a6ade42fa60c6a67a1a