Merge "Skip the endianness marker when converting UCS-2 to UTF-8, since it ends up in the UTF-8 string otherwise."