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

Change-Id: Ib55ae047145673b53042b2e705f4407a0627b5bc