Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493
am: 0f81984970

Change-Id: I1a5b82fc1c48237b0100cf57f3e2fdd49fe30b23