This also includes a fix that allows this code to read surrogate pairs in this processing. Bug: 11070482 Change-Id: If5ef8d6863938252f09128b7e99ea07ece6e7019