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

Change-Id: I689e1fd4d5e8f154638c32eb3b9c2108cf91e7c0