Merge \\\\\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\\\\" into...

Merge \\\\\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\\\\" into lmp-dev am: 5f34f405  -s ours am: 20ae503b am: 012d1246 am: e6373adb  -s ours am: 9f51ebbc am: b47df5d9
am: bfd0b68b

Change-Id: I4699cc34e9d1045ddda8406d0b315891198870ff