Merge "Fix ComputeModifiedUtf8Hash()."
am: b0c3661ac7

Change-Id: Ic092f0d4a14eb930adff8fa022fdfa7cf0f80b1d