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

* commit '7b0c8479ae68c6596df21879c6470ff21560ea03':
  Add support for decoding UTF16 to UTF8