Merge \"Add bound checks to utf16_to_utf8 am: 1deedbacc3 am: ea79ab4e82\" into nyc-mr1-dev-plus-aosp
am: c6ef2604f3

Change-Id: Idae8452834ffbdf3da9975a2a36edfbf245389c0