Spell out UTF-8

Change-Id: Iea5f79fb12ac86d4348f46f8ad93a13aaf0f7eb6