Merge "Remove UtfNormal class"