More unicode string's fixed.

Change-Id: Id056329dbf372e5ce5b64f1ee011af5a1895d2b3