Merge "Use 0 instead of NULL for comparison to char16_t"