Merge "Fix invalid pointer comparisons to 0." am: 334737fa1a am: 8514df9492 am: 955f7c39e7
am: 6acb1f4a6e

Change-Id: I8f7b4cbfa9ffacc7f067dd7b2b0f1a378417102c