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

Change-Id: I2be5794c9c3d8520e43d357b7cf52769bda4a2b9