Merge \"DO NOT MERGE Add bound checks to utf16_to_utf8\" into lmp-dev
am: 5f34f40530  -s ours

Change-Id: I2426d28827f0ee2e2077f31d411af78a58e72b32