Merge \\\\\\\\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\\\\\\\" into lmp-dev am: 5f34f40530  -s ours am: 20ae503b50 am: 012d1246ce am: e6373adbec  -s ours am: 9f51ebbc8b am: b47df5d9e2 am: bfd0b68b74 am: 6cf2cef9ec  -s ours am: 0c42036673
am: 6bc1cb3dd1

Change-Id: I3322ea54065bde49a5c39dacbab0915c0be3253b