Fixed UTF-8 issues

Change-Id: I0f6e33ae73f9e49c7f59736c18fe59b29ea155de