DO NOT MERGE Update Android TZDB from 2022e to 2022f. [T] Notes for Android time zone maintainers: Like all tzdb updates, the binary files in this commit should not be patched to other release branches: they are not guaranteed to work. Also note that there are associated changes in external/icu and often others that should also be applied. tzdb updates are incremental changes: all previous tzdb updates should be applied. Look for aosp/<release>-dev changes for backports. If you have a local branch with ICU changes the ICU .dat file in external/icu will not apply cleanly. Instead, make equivalent changes to text files and run system/timezone/update-tzdata.py. ------------- IANA release 2022f notes: Mexico will no longer observe DST except near the US border. Chihuahua moves to year-round -06 on 2022-10-30. Fiji no longer observes DST. Simplify four Ontario zones. Bug: 257213271 Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Test: CtsIcuTestCases Test: CtsIcu4cTestCases Test: CtsBionicTestCases Test: CtsTextTestCases Test: "adb shell dumpsys runtime" reports 2022f Test: Time Zone Picker shows no DST transition for Pacific/Fiji, Test: America/Chihuahua, America/Ojinaga, America/Mexico_City. Test: Compares csv outputs of dump-tzdata.py - no extra time zone Test: is changed, diffs match to the expectations. Change-Id: I6e041153ce1e06b56be15794d75b733bc1a519f5 Merged-In: I6e041153ce1e06b56be15794d75b733bc1a519f5 (cherry picked from commit 28828a366af4903753483ea3132722818ea4b5db) Merged-In: I6e041153ce1e06b56be15794d75b733bc1a519f5

diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 495065b..495c6bd 100644
--- a/input_data/android/countryzones.txt
+++ b/input_data/android/countryzones.txt

@@ -25,7 +25,7 @@
 # a time zone for an Android device.
 
 # ianaVersion: The version of the IANA rules this file matches.
-ianaVersion:"2022e"
+ianaVersion:"2022f"
 
 # countries:
 #
@@ -847,6 +847,8 @@
     # 5.43M
     priority:5430
     alternativeIds: "America/Montreal"
+    alternativeIds: "America/Nipigon"
+    alternativeIds: "America/Thunder_Bay"
     alternativeIds: "Canada/Eastern"
   >
   timeZoneMappings:<
@@ -868,6 +870,7 @@
     id:"America/Winnipeg"
     # 712K
     priority:712
+    alternativeIds: "America/Rainy_River"
     alternativeIds: "Canada/Central"
   >
   timeZoneMappings:<
@@ -911,13 +914,6 @@
     # 1.12K
     priority:1
   >
-
-  timeZoneMappings:<
-    utcOffset:"-5:00"
-    id:"America/Thunder_Bay"
-    # 108K
-    priority:108
-  >
   timeZoneMappings:<
     utcOffset:"-5:00"
     id:"America/Iqaluit"
@@ -926,12 +922,6 @@
   >
   timeZoneMappings:<
     utcOffset:"-5:00"
-    id:"America/Nipigon"
-    # 1.63K
-    priority:1
-  >
-  timeZoneMappings:<
-    utcOffset:"-5:00"
     id:"America/Pangnirtung"
     # 1.48K
     priority:1
@@ -965,12 +955,6 @@
   >
   timeZoneMappings:<
     utcOffset:"-6:00"
-    id:"America/Rainy_River"
-    # 0.84K
-    priority:1
-  >
-  timeZoneMappings:<
-    utcOffset:"-6:00"
     id:"America/Resolute"
     # 0.20K
     priority:1
@@ -2347,10 +2331,22 @@
   >
   timeZoneMappings:<
     utcOffset:"-6:00"
+    id:"America/Chihuahua"
+    # 878K
+    priority:878
+  >
+  timeZoneMappings:<
+    utcOffset:"-6:00"
     id:"America/Bahia_Banderas"
     # 83.7K
     priority:84
   >
+   timeZoneMappings:<
+     utcOffset:"-6:00"
+     id:"America/Ojinaga"
+     # 28.0K
+     priority:28
+   >
   timeZoneMappings:<
     utcOffset:"-6:00"
     id:"America/Matamoros"
@@ -2367,9 +2363,9 @@
 
   timeZoneMappings:<
     utcOffset:"-7:00"
-    id:"America/Chihuahua"
-    # 878K
-    priority:878
+    id:"America/Hermosillo"
+    # 812K
+    priority:812
   >
   timeZoneMappings:<
     utcOffset:"-7:00"
@@ -2378,18 +2374,6 @@
     priority:658
     alternativeIds: "Mexico/BajaSur"
   >
-  timeZoneMappings:<
-    utcOffset:"-7:00"
-    id:"America/Hermosillo"
-    # 812K
-    priority:812
-  >
-  timeZoneMappings:<
-    utcOffset:"-7:00"
-    id:"America/Ojinaga"
-    # 28.0K
-    priority:28
-  >
 
   timeZoneMappings:<
     utcOffset:"-8:00"

diff --git a/input_data/iana/tzdata2022e.tar.gz b/input_data/iana/tzdata2022e.tar.gz
deleted file mode 100644
index f48c02e..0000000
--- a/input_data/iana/tzdata2022e.tar.gz
+++ /dev/null
Binary files differ

diff --git a/input_data/iana/tzdata2022e.tar.gz.asc b/input_data/iana/tzdata2022e.tar.gz.asc
deleted file mode 100644
index 6e5c0fb..0000000
--- a/input_data/iana/tzdata2022e.tar.gz.asc
+++ /dev/null

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmNFtBMACgkQ7ZfpDmKq
-fjRUzxAAvpQHbranZRCN7Kf5XHR+0oQEio4zDl0ETg/dXmndWUN360JwHIcmzGQR
-H6XHIPihZX/iBq9R+1gzYDijRagWGJ4YgUnp9qJ9GnM2Xj7+DNkTBjuy+p5fMXU2
-/tofAxlaJx4Mb1C7BDLuRc4jtU+36VxCvycwOyEYocngOapOGr/7xooTgYsT6BdR
-UcxdM6E+M/9PR8Mocz7PrVGyA3QanUp/tLtw6Q7s43Ch9E4W7TTX1T9tVF2b/9Ka
-5PmamLEUVBpo0Ia4ofydr0W41sU4A0WRfVu9VjwikNbSJ7Vkw7hEWcgR6aH+GfCN
-2ZfGq7JMPhJh3oWuNOTYx6h2ySS3EgRXo3x+4ktm2UIdublCnjzaXl45Hokuqu2F
-9RzNeSDc5S1obh72SeALH3FymeeI/dUk3nNqZbM1UvxrJtICn6xcbGA5g78ItExb
-BOK19dLzkAo8dduBrBRFo7gZ1wB5hudJn5xeY4jsh1Q6lcnYKdWk6k7DcnirNuJG
-NkbvSlXq+83zxT6DpZXlCpN8qRV6crFcGSq1UUbpX2bRmkqdvmuAOwfdEjqLoH54
-fMHPMBSszzaJdMyGmFM7VaJYWmH/I5mUZHQmT+XagL7ZDjGgwMNsoeCGKPBa7vLx
-lQZU9rwMgqWBm+LimwaZRJrXAoNgk1O+xeYvjNg4cUmiJOgy2wI=
-=XYNS
------END PGP SIGNATURE-----

diff --git a/input_data/iana/tzdata2022f.tar.gz b/input_data/iana/tzdata2022f.tar.gz
new file mode 100644
index 0000000..389cbfa
--- /dev/null
+++ b/input_data/iana/tzdata2022f.tar.gz
Binary files differ

diff --git a/input_data/iana/tzdata2022f.tar.gz.asc b/input_data/iana/tzdata2022f.tar.gz.asc
new file mode 100644
index 0000000..206f2ee
--- /dev/null
+++ b/input_data/iana/tzdata2022f.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmNcfQUACgkQ7ZfpDmKq
+fjRcIBAAhzux6C0XSQtma/RyLPGu18XmXNrFOATZ+pGxZVYEMQCbIwzS5K9yN1eD
+NqmcyRwI+57Kn4WHIaPcAXepcWq20yv9W30CNAZLmI6bgDlY2x2Hy+N+/TZfGWbQ
+FKa0gDKh/KMV5efOsgRQDm4RnM81yoJT7CV6abnaAnvUGtOzBlnsnCD5CbEUPA2s
+RsM/DnHISjofgfRuEyJk1oce/lji4VOaKnoR1u5omUHhOsowAZZs9AVS3dJcYdSc
+58QPrwFoZjDtW5SpXV8lufgJBFEaWpDBzgvqwKyZz4SuRmezZLWedhu06iCLNedB
+ORkL9N5UJj2IXUD46uJGSaFgRyqtAElEzqWjgPsa2HjrTFoDlUfu2+I7HTzE+9ZN
+JldGwJz3P0ZGYUXldiCsV0dIgVsukcXE+8y2t3XSreTrgY+BQkipCaFz/y9vgMN+
+ueudjvcTyTx9K6SCWeZ9UHLGhIPMsTgifmrTi/4Z2O8HHPROtYAF1aAMqKO0qMZ+
+YEJnwsyHWDxty+3eB6NXRuvZjAIK3nTf1KUOy5zh4h0oG1/NG19eCNtzLLC3Zpt8
+KLXrDPqWU2KRs3ts6l1kYTgiebb0w5iUBksMgTxwcslqYFHQfX++lov0PZOv1Mtl
+D46ODcN9NAHxsu+MmX9PtAotMVCyyJhhv6sFHnbqzEiA+faHVXw=
+=E16s
+-----END PGP SIGNATURE-----

diff --git a/output_data/android/tzids.prototxt b/output_data/android/tzids.prototxt
index 9b665a3..77acc7b 100644
--- a/output_data/android/tzids.prototxt
+++ b/output_data/android/tzids.prototxt

@@ -1,5 +1,5 @@
 # Autogenerated file - DO NOT EDIT.
-ianaVersion: "2022e"
+ianaVersion: "2022f"
 countryMappings {
   isoCode: "ad"
   timeZoneIds: "Europe/Andorra"
@@ -432,6 +432,14 @@
     preferredId: "America/Toronto"
   }
   timeZoneLinks {
+    alternativeId: "America/Nipigon"
+    preferredId: "America/Toronto"
+  }
+  timeZoneLinks {
+    alternativeId: "America/Thunder_Bay"
+    preferredId: "America/Toronto"
+  }
+  timeZoneLinks {
     alternativeId: "Canada/Eastern"
     preferredId: "America/Toronto"
   }
@@ -444,6 +452,10 @@
     preferredId: "America/Edmonton"
   }
   timeZoneLinks {
+    alternativeId: "America/Rainy_River"
+    preferredId: "America/Winnipeg"
+  }
+  timeZoneLinks {
     alternativeId: "Canada/Central"
     preferredId: "America/Winnipeg"
   }
@@ -483,21 +495,11 @@
     fromMillis: 1299996000000
   }
   timeZoneReplacements {
-    replacedId: "America/Thunder_Bay"
-    replacementId: "America/Toronto"
-    fromMillis: 120636000000
-  }
-  timeZoneReplacements {
     replacedId: "America/Iqaluit"
     replacementId: "America/Toronto"
     fromMillis: 972802800000
   }
   timeZoneReplacements {
-    replacedId: "America/Nipigon"
-    replacementId: "America/Thunder_Bay"
-    fromMillis: 89186400000
-  }
-  timeZoneReplacements {
     replacedId: "America/Pangnirtung"
     replacementId: "America/Iqaluit"
     fromMillis: 796806000000
@@ -513,11 +515,6 @@
     fromMillis: 1130659200000
   }
   timeZoneReplacements {
-    replacedId: "America/Rainy_River"
-    replacementId: "America/Rankin_Inlet"
-    fromMillis: 986112000000
-  }
-  timeZoneReplacements {
     replacedId: "America/Resolute"
     replacementId: "America/Winnipeg"
     fromMillis: 1173600000000
@@ -1242,9 +1239,7 @@
   timeZoneIds: "America/Mexico_City"
   timeZoneIds: "America/Matamoros"
   timeZoneIds: "America/Cancun"
-  timeZoneIds: "America/Chihuahua"
   timeZoneIds: "America/Hermosillo"
-  timeZoneIds: "America/Ojinaga"
   timeZoneIds: "America/Tijuana"
   timeZoneLinks {
     alternativeId: "Mexico/General"
@@ -1277,14 +1272,24 @@
     fromMillis: 594198000000
   }
   timeZoneReplacements {
+    replacedId: "America/Chihuahua"
+    replacementId: "America/Mexico_City"
+    fromMillis: 1667116800000
+  }
+  timeZoneReplacements {
     replacedId: "America/Bahia_Banderas"
     replacementId: "America/Mexico_City"
     fromMillis: 1270371600000
   }
   timeZoneReplacements {
+    replacedId: "America/Ojinaga"
+    replacementId: "America/Mexico_City"
+    fromMillis: 1667116800000
+  }
+  timeZoneReplacements {
     replacedId: "America/Mazatlan"
-    replacementId: "America/Chihuahua"
-    fromMillis: 891766800000
+    replacementId: "America/Hermosillo"
+    fromMillis: 1667116800000
   }
 }
 countryMappings {

diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 9069a0e..e0fd863 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml

@@ -2,7 +2,7 @@
 
  **** Autogenerated file - DO NOT EDIT ****
 
---><timezones ianaversion="2022e">
+--><timezones ianaversion="2022f">
  <countryzones>
   <country code="ad" default="Europe/Andorra" everutc="n">
    <id>Europe/Andorra</id>
@@ -159,25 +159,22 @@
    <id>America/Belize</id>
   </country>
   <country code="ca" default="America/Toronto" everutc="n">
-   <id alts="America/Montreal,Canada/Eastern">America/Toronto</id>
+   <id alts="America/Montreal,America/Nipigon,America/Thunder_Bay,Canada/Eastern">America/Toronto</id>
    <id alts="Canada/Pacific">America/Vancouver</id>
    <id alts="Canada/Mountain">America/Edmonton</id>
-   <id alts="Canada/Central">America/Winnipeg</id>
+   <id alts="America/Rainy_River,Canada/Central">America/Winnipeg</id>
    <id alts="Canada/Atlantic">America/Halifax</id>
    <id alts="Canada/Newfoundland">America/St_Johns</id>
    <id notafter="1162098000000" repl="America/Halifax">America/Moncton</id>
    <id notafter="57733200000" repl="America/Halifax">America/Glace_Bay</id>
    <id notafter="1299996000000" repl="America/Halifax">America/Goose_Bay</id>
    <id>America/Blanc-Sablon</id>
-   <id notafter="120636000000" repl="America/Toronto">America/Thunder_Bay</id>
    <id notafter="972802800000" repl="America/Toronto">America/Iqaluit</id>
-   <id notafter="89186400000" repl="America/Thunder_Bay">America/Nipigon</id>
    <id notafter="796806000000" repl="America/Iqaluit">America/Pangnirtung</id>
    <id alts="America/Coral_Harbour">America/Atikokan</id>
    <id alts="Canada/Saskatchewan">America/Regina</id>
    <id notafter="73472400000" repl="America/Regina">America/Swift_Current</id>
    <id notafter="1130659200000" repl="America/Winnipeg">America/Rankin_Inlet</id>
-   <id notafter="986112000000" repl="America/Rankin_Inlet">America/Rainy_River</id>
    <id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
    <id notafter="309945600000" repl="America/Edmonton">America/Yellowknife</id>
    <id>America/Dawson_Creek</id>
@@ -571,13 +568,13 @@
    <id alts="Mexico/General">America/Mexico_City</id>
    <id notafter="407653200000" repl="America/Mexico_City">America/Merida</id>
    <id notafter="594198000000" repl="America/Mexico_City">America/Monterrey</id>
+   <id notafter="1667116800000" repl="America/Mexico_City">America/Chihuahua</id>
    <id notafter="1270371600000" repl="America/Mexico_City">America/Bahia_Banderas</id>
+   <id notafter="1667116800000" repl="America/Mexico_City">America/Ojinaga</id>
    <id>America/Matamoros</id>
    <id>America/Cancun</id>
-   <id>America/Chihuahua</id>
-   <id notafter="891766800000" repl="America/Chihuahua" alts="Mexico/BajaSur">America/Mazatlan</id>
    <id>America/Hermosillo</id>
-   <id>America/Ojinaga</id>
+   <id notafter="1667116800000" repl="America/Hermosillo" alts="Mexico/BajaSur">America/Mazatlan</id>
    <id alts="America/Ensenada,America/Santa_Isabel,Mexico/BajaNorte">America/Tijuana</id>
   </country>
   <country code="my" default="Asia/Kuala_Lumpur" everutc="n">

diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index b0b7498..924aa7a 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
Binary files differ

diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index a2247b8..83d202c 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
Binary files differ

diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index 10f8bbc..63f0c5d 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
Binary files differ

diff --git a/output_data/version/tz_version b/output_data/version/tz_version
index 56d7b91..fb2c807 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version

@@ -1 +1 @@
-006.001|2022e|001
\ No newline at end of file
+006.001|2022f|001
\ No newline at end of file

diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index 972dca6..c8430b8 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml

@@ -159,25 +159,22 @@
    <id>America/Belize</id>
   </country>
   <country code="ca" default="America/Toronto" everutc="n">
-   <id alts="America/Montreal,Canada/Eastern">America/Toronto</id>
+   <id alts="America/Montreal,America/Nipigon,America/Thunder_Bay,Canada/Eastern">America/Toronto</id>
    <id alts="Canada/Pacific">America/Vancouver</id>
    <id alts="Canada/Mountain">America/Edmonton</id>
-   <id alts="Canada/Central">America/Winnipeg</id>
+   <id alts="America/Rainy_River,Canada/Central">America/Winnipeg</id>
    <id alts="Canada/Atlantic">America/Halifax</id>
    <id alts="Canada/Newfoundland">America/St_Johns</id>
    <id notafter="1162098000000" repl="America/Halifax">America/Moncton</id>
    <id notafter="57733200000" repl="America/Halifax">America/Glace_Bay</id>
    <id notafter="1299996000000" repl="America/Halifax">America/Goose_Bay</id>
    <id>America/Blanc-Sablon</id>
-   <id notafter="120636000000" repl="America/Toronto">America/Thunder_Bay</id>
    <id notafter="972802800000" repl="America/Toronto">America/Iqaluit</id>
-   <id notafter="89186400000" repl="America/Thunder_Bay">America/Nipigon</id>
    <id notafter="796806000000" repl="America/Iqaluit">America/Pangnirtung</id>
    <id alts="America/Coral_Harbour">America/Atikokan</id>
    <id alts="Canada/Saskatchewan">America/Regina</id>
    <id notafter="73472400000" repl="America/Regina">America/Swift_Current</id>
    <id notafter="1130659200000" repl="America/Winnipeg">America/Rankin_Inlet</id>
-   <id notafter="986112000000" repl="America/Rankin_Inlet">America/Rainy_River</id>
    <id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
    <id notafter="309945600000" repl="America/Edmonton">America/Yellowknife</id>
    <id>America/Dawson_Creek</id>
@@ -571,13 +568,13 @@
    <id alts="Mexico/General">America/Mexico_City</id>
    <id notafter="407653200000" repl="America/Mexico_City">America/Merida</id>
    <id notafter="594198000000" repl="America/Mexico_City">America/Monterrey</id>
+   <id notafter="1667116800000" repl="America/Mexico_City">America/Chihuahua</id>
    <id notafter="1270371600000" repl="America/Mexico_City">America/Bahia_Banderas</id>
+   <id notafter="1667116800000" repl="America/Mexico_City">America/Ojinaga</id>
    <id>America/Matamoros</id>
    <id>America/Cancun</id>
-   <id>America/Chihuahua</id>
-   <id notafter="891766800000" repl="America/Chihuahua" alts="Mexico/BajaSur">America/Mazatlan</id>
    <id>America/Hermosillo</id>
-   <id>America/Ojinaga</id>
+   <id notafter="1667116800000" repl="America/Hermosillo" alts="Mexico/BajaSur">America/Mazatlan</id>
    <id alts="America/Ensenada,America/Santa_Isabel,Mexico/BajaNorte">America/Tijuana</id>
   </country>
   <country code="my" default="Asia/Kuala_Lumpur" everutc="n">

diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index e85e3f4..5d87d7a 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
Binary files differ

diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index 73c70c3..1845b30 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
Binary files differ

diff --git a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
index 6687b39..d7aee7e 100644
--- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
Binary files differ

diff --git a/testing/data/test2/output_data/android/tzlookup.xml b/testing/data/test2/output_data/android/tzlookup.xml
index 9967548..ddccc10 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml

@@ -159,25 +159,22 @@
    <id>America/Belize</id>
   </country>
   <country code="ca" default="America/Toronto" everutc="n">
-   <id alts="America/Montreal,Canada/Eastern">America/Toronto</id>
+   <id alts="America/Montreal,America/Nipigon,America/Thunder_Bay,Canada/Eastern">America/Toronto</id>
    <id alts="Canada/Pacific">America/Vancouver</id>
    <id alts="Canada/Mountain">America/Edmonton</id>
-   <id alts="Canada/Central">America/Winnipeg</id>
+   <id alts="America/Rainy_River,Canada/Central">America/Winnipeg</id>
    <id alts="Canada/Atlantic">America/Halifax</id>
    <id alts="Canada/Newfoundland">America/St_Johns</id>
    <id notafter="1162098000000" repl="America/Halifax">America/Moncton</id>
    <id notafter="57733200000" repl="America/Halifax">America/Glace_Bay</id>
    <id notafter="1299996000000" repl="America/Halifax">America/Goose_Bay</id>
    <id>America/Blanc-Sablon</id>
-   <id notafter="120636000000" repl="America/Toronto">America/Thunder_Bay</id>
    <id notafter="972802800000" repl="America/Toronto">America/Iqaluit</id>
-   <id notafter="89186400000" repl="America/Thunder_Bay">America/Nipigon</id>
    <id notafter="796806000000" repl="America/Iqaluit">America/Pangnirtung</id>
    <id alts="America/Coral_Harbour">America/Atikokan</id>
    <id alts="Canada/Saskatchewan">America/Regina</id>
    <id notafter="73472400000" repl="America/Regina">America/Swift_Current</id>
    <id notafter="1130659200000" repl="America/Winnipeg">America/Rankin_Inlet</id>
-   <id notafter="986112000000" repl="America/Rankin_Inlet">America/Rainy_River</id>
    <id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
    <id notafter="309945600000" repl="America/Edmonton">America/Yellowknife</id>
    <id>America/Dawson_Creek</id>
@@ -571,13 +568,13 @@
    <id alts="Mexico/General">America/Mexico_City</id>
    <id notafter="407653200000" repl="America/Mexico_City">America/Merida</id>
    <id notafter="594198000000" repl="America/Mexico_City">America/Monterrey</id>
+   <id notafter="1667116800000" repl="America/Mexico_City">America/Chihuahua</id>
    <id notafter="1270371600000" repl="America/Mexico_City">America/Bahia_Banderas</id>
+   <id notafter="1667116800000" repl="America/Mexico_City">America/Ojinaga</id>
    <id>America/Matamoros</id>
    <id>America/Cancun</id>
-   <id>America/Chihuahua</id>
-   <id notafter="891766800000" repl="America/Chihuahua" alts="Mexico/BajaSur">America/Mazatlan</id>
    <id>America/Hermosillo</id>
-   <id>America/Ojinaga</id>
+   <id notafter="1667116800000" repl="America/Hermosillo" alts="Mexico/BajaSur">America/Mazatlan</id>
    <id alts="America/Ensenada,America/Santa_Isabel,Mexico/BajaNorte">America/Tijuana</id>
   </country>
   <country code="my" default="Asia/Kuala_Lumpur" everutc="n">

diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 166d5a2..5a36d30 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
Binary files differ

diff --git a/testing/data/test2/output_data/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index 7ece044..ac697d6 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
Binary files differ

diff --git a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
index 1d8081c..fb9f4e8 100644
--- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
Binary files differ

diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml
index 972dca6..c8430b8 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml

@@ -159,25 +159,22 @@
    <id>America/Belize</id>
   </country>
   <country code="ca" default="America/Toronto" everutc="n">
-   <id alts="America/Montreal,Canada/Eastern">America/Toronto</id>
+   <id alts="America/Montreal,America/Nipigon,America/Thunder_Bay,Canada/Eastern">America/Toronto</id>
    <id alts="Canada/Pacific">America/Vancouver</id>
    <id alts="Canada/Mountain">America/Edmonton</id>
-   <id alts="Canada/Central">America/Winnipeg</id>
+   <id alts="America/Rainy_River,Canada/Central">America/Winnipeg</id>
    <id alts="Canada/Atlantic">America/Halifax</id>
    <id alts="Canada/Newfoundland">America/St_Johns</id>
    <id notafter="1162098000000" repl="America/Halifax">America/Moncton</id>
    <id notafter="57733200000" repl="America/Halifax">America/Glace_Bay</id>
    <id notafter="1299996000000" repl="America/Halifax">America/Goose_Bay</id>
    <id>America/Blanc-Sablon</id>
-   <id notafter="120636000000" repl="America/Toronto">America/Thunder_Bay</id>
    <id notafter="972802800000" repl="America/Toronto">America/Iqaluit</id>
-   <id notafter="89186400000" repl="America/Thunder_Bay">America/Nipigon</id>
    <id notafter="796806000000" repl="America/Iqaluit">America/Pangnirtung</id>
    <id alts="America/Coral_Harbour">America/Atikokan</id>
    <id alts="Canada/Saskatchewan">America/Regina</id>
    <id notafter="73472400000" repl="America/Regina">America/Swift_Current</id>
    <id notafter="1130659200000" repl="America/Winnipeg">America/Rankin_Inlet</id>
-   <id notafter="986112000000" repl="America/Rankin_Inlet">America/Rainy_River</id>
    <id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
    <id notafter="309945600000" repl="America/Edmonton">America/Yellowknife</id>
    <id>America/Dawson_Creek</id>
@@ -571,13 +568,13 @@
    <id alts="Mexico/General">America/Mexico_City</id>
    <id notafter="407653200000" repl="America/Mexico_City">America/Merida</id>
    <id notafter="594198000000" repl="America/Mexico_City">America/Monterrey</id>
+   <id notafter="1667116800000" repl="America/Mexico_City">America/Chihuahua</id>
    <id notafter="1270371600000" repl="America/Mexico_City">America/Bahia_Banderas</id>
+   <id notafter="1667116800000" repl="America/Mexico_City">America/Ojinaga</id>
    <id>America/Matamoros</id>
    <id>America/Cancun</id>
-   <id>America/Chihuahua</id>
-   <id notafter="891766800000" repl="America/Chihuahua" alts="Mexico/BajaSur">America/Mazatlan</id>
    <id>America/Hermosillo</id>
-   <id>America/Ojinaga</id>
+   <id notafter="1667116800000" repl="America/Hermosillo" alts="Mexico/BajaSur">America/Mazatlan</id>
    <id alts="America/Ensenada,America/Santa_Isabel,Mexico/BajaNorte">America/Tijuana</id>
   </country>
   <country code="my" default="Asia/Kuala_Lumpur" everutc="n">

diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index e6e5375..e550fb6 100644
--- a/testing/data/test3/output_data/distro/distro.zip
+++ b/testing/data/test3/output_data/distro/distro.zip
Binary files differ

diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index 73c70c3..1845b30 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
Binary files differ

diff --git a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
index c96204e..6372b27 100644
--- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
Binary files differ