utf, enhance code, no real impact

Change-Id: I71549b99f384557a87efc27c4b97aab09de4d96c