Merge "Insert into user dict with the correct locale" into ics-mr1