Even more unicode strings fixed.

Change-Id: Iee340583795d7e88248fdf5e63bff2c59cae608a