Merge \\"Add bound checks to utf16_to_utf8\\" into nyc-mr1-dev am: bea67b8a70
am: c33ece57d9

Change-Id: I4b9ba9a844dca384f708d9388933eb653c638de6