Fixed UTF-8 issues

Change-Id: I263c06a97cd62355f572925077665a15e7620621