make sure unicode characters are normalized

Bug: 62870
Change-Id: I7f3fa5ac572938602e915c22a47d2e7f7e61caaf
Merge "make sure unicode characters are normalized"