Merge "Consistent handling of modified UTF-8."