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

Change-Id: I451066bdcc955ad76e81f1650f1583b5b560a094