Cherry-pick an upstream fix for UTF8 to UTF8 conversion

Bug: 794390
Change-Id: I31a1e622b38060c322be8086cc8aefdafb431a1b
Reviewed-on: https://chromium-review.googlesource.com/822188
Reviewed-by: Mark Mentovai <mark@chromium.org>
3 files changed