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

Change-Id: Ibbaacc65f571ce4169b8749a8625125b2c33bd4a