supports unicode

Change-Id: If90bd989767f83afdae83da61347f506e727ba72