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

Change-Id: I07f7f569d97ccf58cd48f11e700c64d2eaeededc