Merge "Fix makeUniqueWithTrailingData."