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

Change-Id: I80b2a53cbfea246f1341d6169809582ff2988a81