Merge "Use String8 for UTF16 to UTF8 conversion."
am: 527c91320d

Change-Id: Ica55f07373dfada4729df8472b1bae71bf0011c3