Merge "Consistent style for comparisons of raw pointers to NULL"