Merge "Fix invalid pointer comparisons to 0." am: 334737fa1a
am: 8514df9492

Change-Id: I20d2d11abea14bee09996bc7433a19c9a948577e