Merge "Remove time_zones_by_country.xml file"