Merge "Add more character sets" am: 97065a1e01

Change-Id: I1c597b2c27845327e3e263ca7ea4cf6933ce3ad6