Merge \\"Add bound checks to utf16_to_utf8\\" into nyc-mr1-dev am: 9e3a43e817
am: bd95c7088b

Change-Id: I1e37ce4f3dcf75af5faf6ac06057f94b8476ae84