Fixed Unicode build

Change-Id: I05060b5590a21dea04057878f2b26285bfb84d58