Fix swap unicode handling

Change-Id: I2585f86c6cc975f9bbde5fcd3f6fc74307b965f8