Merge "Add support for decoding UTF16 to UTF8"
am: ac4728f8ba

* commit 'ac4728f8ba54e5f25466efeaf65a1dbda179ca97':
  Add support for decoding UTF16 to UTF8