Instead, use "code points" (if you mean full 21-bit Unicode code
points), or "code units" (if you mean the 16-bit units that make up
UTF-16). Hopefully I got it right which one was meant in each case
here.

Change-Id: I8ee7a98996f1cebcfb95cd7d18a56570e48fa390