[XLS-464,XLS-566] Fix unicode build error from previous commit