Merge "Use nullptr instead of NULL for make_pair"