Merge \"Add bound checks to utf16_to_utf8\" into nyc-mr1-dev
am: 49c410bc48

Change-Id: I9a226afc143db459184a279167f0dce66c0f32df