Fixes bug with unicode data

Closes-bug: #1399648
Change-Id: I5397fddeb5fd04582baa48a31fc957f193330f1d
Merge "Fixes bug with unicode data"