make_i18n_dict from compat

Change-Id: I6552bd4ec2edf94f1852ea8d5415730f55de8483
Merge "make_i18n_dict from compat"