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

* commit '2df13452e05745a3da624c34018da983173c32c4':
  Insert into user dict with the correct locale