Merge "Fix typo in generic.c."