am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also...
am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1
* commit '4b23789e':
DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.