Merge "Add more character sets" am: 97065a1e01 am: 9dc13adfe8

Change-Id: Idc1bb48601c052ec51e9091a28cde7973d1faf8f