Merge "Change the path of ICU .dat file pointing to the new i18n apex module"