Merge "Fix function names in CHECK_NON_NULL_ARGUMENT."