Fix Unicode issues.

Change-Id: I2938d35d47704c7e52ca5b186b41fb309a04c8bb