Merge "Migrate UnicodeString usage to equivalent C API"