Fixed UTF-8 issues

Change-Id: I2ff9cc23c165412f667d30132e80835414080e9a