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

Change-Id: I2030fb4f432f7f90b9f46fadce5e4fb1976e5fef