Merge "Revert "[ML14] Forward the locale list to relevant places""