am 0235016a: am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1

* commit '0235016acb241556f24689e3d818db6973b5ad4f':
  Insert into user dict with the correct locale