Merge "Add support for decoding UTF16 to UTF8" am: ac4728f8ba am: 7b0c8479ae
am: 4ab1dbe559

* commit '4ab1dbe5594b672532db5996dce3b77dbedd7580':
  Add support for decoding UTF16 to UTF8