Merge "Drop codepoints that are outside the Unicode range - DO NOT MERGE" into nyc-mr2-dev am: 61fccac187  -s ours am: 921f2490aa am: a1527b22a0
am: 061c7a7f0a

Change-Id: I8019665dc42d93bebc085ddbd65faf03288bb841