Merge "Fix ComputeModifiedUtf8Hash()."