Merge "Update time_zones_by_country.xml / delete unused files"