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

Change-Id: If77f4cfe54e96f7658b001eb3e15b15ce8fb6ac6