Merge "Handle removal of time_zones_by_country.xml"