Merge "Remove getUnicodeFunc"