Merge "MTP: handle bad conversion from UTF-16 to UTF-8"