Make change and version bump to aml_tz3_314010000 for mainline module file: apex/manifest.json

Snap for 11462494 from d4965a6d02b375c9d5f35b6ed0e8f91d37e5967e to mainline-tzdata3-release

Change-Id: Ia6fee0a996000e665dd6558dcc82e628397c71a1

25 files changed, 124 insertions, 97 deletions

diff --git a/apex/manifest.json b/apex/manifest.json
index f778a327..33c44714 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.tzdata",
-  "version": 313110000
+  "version": 314010000
 }
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index c96b2cab..52d4b9d0 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:"2023a"
+ianaVersion:"2024a"
 
 # countries:
 #
@@ -255,7 +255,7 @@ countries:<
   >
 
   timeZoneMappings:<
-    utcOffset:"11:00"
+    utcOffset:"8:00"
     id:"Antarctica/Casey"
   >
 
@@ -270,7 +270,7 @@ countries:<
   >
 
   timeZoneMappings:<
-    utcOffset:"6:00"
+    utcOffset:"5:00"
     id:"Antarctica/Vostok"
   >
 
@@ -1512,22 +1512,32 @@ countries:<
   timeZoneMappings:<
     utcOffset:"0:00"
     id:"America/Danmarkshavn"
+    # Setting lowest possible value.
+    priority:1
   >
 
   timeZoneMappings:<
-    utcOffset:"-1:00"
-    id:"America/Scoresbysund"
+    utcOffset:"-2:00"
+    id:"America/Nuuk"
+    alternativeIds: "America/Godthab"
+    # Population of Nuuk was 17635 (2017) according to Wikipedia.
+    priority:17
   >
 
   timeZoneMappings:<
     utcOffset:"-2:00"
-    id:"America/Nuuk"
-    alternativeIds: "America/Godthab"
+    id:"America/Scoresbysund"
+    # Scoresbysund's (now known as Ittoqqortoormiit) population was 345 (2020) according to
+    # Wikipedia.
+    priority:1
   >
 
   timeZoneMappings:<
     utcOffset:"-4:00"
     id:"America/Thule"
+    # Qaanaaq's, formerly known as Thule or New Thule, population was 646 (2020) according to
+    # Wikipedia.
+    priority:1
   >
 >
 
@@ -1932,46 +1942,54 @@ countries:<
 
 # KAZAKHSTAN
 #
-# Priorities assigned on 20190107 using:
+# Priorities assigned on 13 Feb 2024 using:
 # https://en.wikipedia.org/wiki/List_of_cities_in_Kazakhstan
-# Priority is just an abstract score.
+# Priority is related to city population.
 countries:<
   isoCode:"kz"
   defaultTimeZoneId:"Asia/Almaty"
   timeZoneMappings:<
-    utcOffset:"6:00"
+    utcOffset:"5:00"
     id:"Asia/Almaty"
-    priority:2
+    # Population is 2.217M (wiki, 2023)
+    priority:2217
   >
   timeZoneMappings:<
-    utcOffset:"6:00"
-    id:"Asia/Qostanay"
+    utcOffset:"5:00"
+    id:"Asia/Aqtobe"
+    # Population is 560K (wiki 2023)
+    priority:560
   >
-
   timeZoneMappings:<
     utcOffset:"5:00"
-    id:"Asia/Oral"
-    priority:2
+    id:"Asia/Qyzylorda"
+    # Population is 315500 (wiki, 2023)
+    # Rounding up to avoid conflicts with Asia/Atyrau.
+    priority:316
   >
   timeZoneMappings:<
     utcOffset:"5:00"
-    id:"Asia/Aqtau"
-    priority:1
+    id:"Asia/Atyrau"
+    # Population is 315274 (wiki, 2023)
+    priority:315
   >
   timeZoneMappings:<
     utcOffset:"5:00"
-    id:"Asia/Qyzylorda"
-    priority:1
+    id:"Asia/Aqtau"
+    # Population is 270K (wiki, 2023)
+    priority:270
   >
   timeZoneMappings:<
     utcOffset:"5:00"
-    id:"Asia/Aqtobe"
-    priority:1
+    id:"Asia/Qostanay"
+    # Population is 265K (wiki, 2023)
+    priority:265
   >
   timeZoneMappings:<
     utcOffset:"5:00"
-    id:"Asia/Atyrau"
-    priority:1
+    id:"Asia/Oral"
+    # Population is 254K (wiki, 2023)
+    priority:254
   >
 >
 
diff --git a/input_data/iana/tzdata2023a.tar.gz b/input_data/iana/tzdata2023a.tar.gz
deleted file mode 100644
index 825ee436..00000000
--- a/input_data/iana/tzdata2023a.tar.gz
+++ /dev/null
diff --git a/input_data/iana/tzdata2023a.tar.gz.asc b/input_data/iana/tzdata2023a.tar.gz.asc
deleted file mode 100644
index 5658527e..00000000
--- a/input_data/iana/tzdata2023a.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQbXA8ACgkQ7ZfpDmKq
-fjRngg/8D8E5sJIt412pmR7yIQYnsG44nSiELNpiewG+SF4DofW7quQDQEjDMdVn
-seLU9okE1/l+1SN6eibMJgvho/6HWkU9kWLzYCY29sljTVYqEu6vLo1IY1OJIkjC
-9yieL33oLkN4LIeSMzR4QOCkRfusYNRYq3uryVtMu7R6HP2PgMlmmJf/imV192tj
-ONJXNA4Y30EvJ3lHuXMbr7fNg9hXSLjRy1NPKjp5OVZ3jZVXPljrC+egAfhLjZdQ
-uB5a3uGjAX+KjemCHwTmrrmmcUlaHxFxlfN5gX5cNIXuyrYtz0PAhy+MhBM5F9iY
-erYWg6EfBr7IfSyS1JcDZ1ypwZ66EpKxXfWZNm+HFA4dDdnWgvlM4n1OyKjw03Dq
-4/agYr34cUDhfBUS57dtpZSibtdpbh8oiqxc+wXV3KZcHXVpX3XRyGTH1UVINfnF
-nXArC09JKUt7Tjol83TPH0jDXJAxabkgUDJHfpeQ5A8r3GNW1PQ/OF25ieRb+AFQ
-jWFbiEIxSXmUwnRc6wHiLX/gU0TT7vVMokN5erx9IGwrDEQAljuEJoj2bYFT/q9D
-8jFA+48r/nK2r33+OBrz6aryoMNptquuMG0XR4aSr6KO3e622+vuF4nSN7hg2sAM
-/bMLSlzOGUEmOZ2D7hP5MDdWw5L0WQAjX7/8xKzdlMhqkx4Mc9Q=
-=OxWX
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2024a.tar.gz b/input_data/iana/tzdata2024a.tar.gz
new file mode 100644
index 00000000..febf30b0
--- /dev/null
+++ b/input_data/iana/tzdata2024a.tar.gz
diff --git a/input_data/iana/tzdata2024a.tar.gz.asc b/input_data/iana/tzdata2024a.tar.gz.asc
new file mode 100644
index 00000000..a8d198fd
--- /dev/null
+++ b/input_data/iana/tzdata2024a.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmW716sACgkQ7ZfpDmKq
+fjTkQQ/6AqS/VNV6+RbbyLbLuOzh4GvYDMq1xTxGnjj7nwr80ob/wwSVmX7Gf5xt
+gVgagC75EJyskY6dfUPbSHwmOx8Dk2ttQtEprhhzk+1WpUSPZoy/RYMdWN+JzO3s
+LekrzU86SAh7yP21qSovYRM5rW02Da5RmiLUmknzBpP2cuZsq3qSPYUEMjB3JO39
+OzBq0nyLbUR9nqew/f6fcPviyweqTkZdcDsr/+jNUGDI/kezGQ0u3ExlGc0EmGU0
+ISAFB7uSDWgoJlwH3ZBtI4lOxiVQRKXafFcdvmLka0hYDGOm6f2zvkhvLEHVN9xK
+/V680qKy1vIOkyDRp664P9qZ0951+tpb9I47ip7SLqqBoyWhlfb/SJ2eFfb3k+kx
+fPkCX89QsqkfSPXySJCO13YYEQXpI2VPdWi0JxDI+LD/VEHITiydrYT+afnn0iyZ
+bM/TKnqaQ4bhAXdLBj3oUSwFQHEgPgeLOrTmWEdN9YmO5Cwbm1gZvOKZ4u2CYW6I
+ZM+ZwCuNO1hqYRSoeIaN60fUOneXaOcAejlOS/bJr7hNKUtmAjsSS7S7YGeNgQld
+LXRDRD3vou/qIHlIhmGpTUlOBl5NXVrP42w91nBYEwNyY4lbKLw22GS4FRF1cu9+
+wfMfJqY4wwDp/uDMXAfWIXU1AdMg7t1NephMIGg4mivKGYmQmvY=
+=CvSR
+-----END PGP SIGNATURE-----
diff --git a/input_tools/android/tzlookup_generator/src/test/java/com/android/libcore/timezone/tzlookup/TzLookupGeneratorTest.java b/input_tools/android/tzlookup_generator/src/test/java/com/android/libcore/timezone/tzlookup/TzLookupGeneratorTest.java
index 778e25db..6d315520 100644
--- a/input_tools/android/tzlookup_generator/src/test/java/com/android/libcore/timezone/tzlookup/TzLookupGeneratorTest.java
+++ b/input_tools/android/tzlookup_generator/src/test/java/com/android/libcore/timezone/tzlookup/TzLookupGeneratorTest.java
@@ -391,22 +391,26 @@ public class TzLookupGeneratorTest {
                 + "timeZoneMappings:<\n"
                 + "  utcOffset:\"0:00\"\n"
                 + "  id:\"America/Danmarkshavn\"\n"
+                + "  priority:1\n"
                 + ">\n"
                 + "\n"
                 + "timeZoneMappings:<\n"
-                + "  utcOffset:\"-1:00\"\n"
-                + "  id:\"America/Scoresbysund\"\n"
+                + "  utcOffset:\"-2:00\"\n"
+                + "  id:\"America/Godthab\"\n"
+                + "  alternativeIds: \"America/Nuuk\"\n"
+                + "  priority: 17\n"
                 + ">\n"
                 + "\n"
                 + "timeZoneMappings:<\n"
                 + "  utcOffset:\"-2:00\"\n"
-                + "  id:\"America/Godthab\"\n"
-                + "  alternativeIds: \"America/Nuuk\"\n"
+                + "  id:\"America/Scoresbysund\"\n"
+                + "  priority:1\n"
                 + ">\n"
                 + "\n"
                 + "timeZoneMappings:<\n"
                 + "  utcOffset:\"-4:00\"\n"
                 + "  id:\"America/Thule\"\n"
+                + "  priority:1\n"
                 + ">\n";
         Country country = parseCountry(countryZonesWithOldIdText);
         List<ZoneTabFile.CountryEntry> zoneTabWithNewIds = Arrays.asList(
@@ -419,7 +423,8 @@ public class TzLookupGeneratorTest {
         OutputData outputData = generateOutputData(country, zoneTabWithNewIds);
 
         String expectedTzLookupOutput = "<id>America/Danmarkshavn</id>\n"
-                + "<id>America/Scoresbysund</id>\n"
+                + "<id notafter=\"1711846800000\" repl=\"America/Godthab\">"
+                + "America/Scoresbysund</id>\n"
                 + "<id alts=\"America/Nuuk\">America/Godthab</id>\n"
                 + "<id>America/Thule</id>\n";
         String[] expectedTzLookupXmlLines = expectedTzLookupOutput.split("\\n");
@@ -434,13 +439,13 @@ public class TzLookupGeneratorTest {
         TzIdsProto.CountryMapping.Builder b = TzIdsProto.CountryMapping.newBuilder()
                 .setIsoCode("gl")
                 .addTimeZoneIds("America/Danmarkshavn")
-                .addTimeZoneIds("America/Scoresbysund")
                 .addTimeZoneIds("America/Godthab")
                 .addTimeZoneIds("America/Thule");
 
         // Because Android lists America/Nuuk in alternativeIds in countryzones.txt, the link will
         // be reversed from the usual.
         addLink(b, "America/Nuuk" /* alternativeId */, "America/Godthab" /* preferredId */);
+        addReplacement(b, 1711846800000L, "America/Godthab", "America/Scoresbysund");
 
         tzIdsBuilder.addCountryMappings(b);
         assertEquals(tzIdsBuilder.build(), outputData.timeZoneIds);
diff --git a/output_data/android/tzids.prototxt b/output_data/android/tzids.prototxt
index 0bb24e61..a1db2cc5 100644
--- a/output_data/android/tzids.prototxt
+++ b/output_data/android/tzids.prototxt
@@ -1,5 +1,5 @@
 # Autogenerated file - DO NOT EDIT.
-ianaVersion: "2023a"
+ianaVersion: "2024a"
 countryMappings {
   isoCode: "ad"
   timeZoneIds: "Europe/Andorra"
@@ -425,6 +425,7 @@ countryMappings {
   timeZoneIds: "America/Blanc-Sablon"
   timeZoneIds: "America/Atikokan"
   timeZoneIds: "America/Regina"
+  timeZoneIds: "America/Dawson_Creek"
   timeZoneIds: "America/Whitehorse"
   timeZoneLinks {
     alternativeId: "America/Montreal"
@@ -522,11 +523,6 @@ countryMappings {
     fromMillis: 1173600000000
   }
   timeZoneReplacements {
-    replacedId: "America/Dawson_Creek"
-    replacementId: "America/Whitehorse"
-    fromMillis: 1604214000000
-  }
-  timeZoneReplacements {
     replacedId: "America/Creston"
     replacementId: "America/Dawson_Creek"
     fromMillis: 84013200000
@@ -822,13 +818,17 @@ countryMappings {
 countryMappings {
   isoCode: "gl"
   timeZoneIds: "America/Danmarkshavn"
-  timeZoneIds: "America/Scoresbysund"
   timeZoneIds: "America/Nuuk"
   timeZoneIds: "America/Thule"
   timeZoneLinks {
     alternativeId: "America/Godthab"
     preferredId: "America/Nuuk"
   }
+  timeZoneReplacements {
+    replacedId: "America/Scoresbysund"
+    replacementId: "America/Nuuk"
+    fromMillis: 1711846800000
+  }
 }
 countryMappings {
   isoCode: "gm"
@@ -1046,30 +1046,34 @@ countryMappings {
 countryMappings {
   isoCode: "kz"
   timeZoneIds: "Asia/Almaty"
-  timeZoneIds: "Asia/Oral"
   timeZoneReplacements {
-    replacedId: "Asia/Qostanay"
+    replacedId: "Asia/Aqtobe"
     replacementId: "Asia/Almaty"
-    fromMillis: 1099170000000
-  }
-  timeZoneReplacements {
-    replacedId: "Asia/Aqtau"
-    replacementId: "Asia/Oral"
-    fromMillis: 1099173600000
+    fromMillis: 1709229600000
   }
   timeZoneReplacements {
     replacedId: "Asia/Qyzylorda"
-    replacementId: "Asia/Oral"
+    replacementId: "Asia/Aqtobe"
     fromMillis: 1545328800000
   }
   timeZoneReplacements {
-    replacedId: "Asia/Aqtobe"
-    replacementId: "Asia/Oral"
+    replacedId: "Asia/Atyrau"
+    replacementId: "Asia/Aqtobe"
     fromMillis: 1099173600000
   }
   timeZoneReplacements {
-    replacedId: "Asia/Atyrau"
-    replacementId: "Asia/Oral"
+    replacedId: "Asia/Aqtau"
+    replacementId: "Asia/Aqtobe"
+    fromMillis: 1099173600000
+  }
+  timeZoneReplacements {
+    replacedId: "Asia/Qostanay"
+    replacementId: "Asia/Almaty"
+    fromMillis: 1099170000000
+  }
+  timeZoneReplacements {
+    replacedId: "Asia/Oral"
+    replacementId: "Asia/Atyrau"
     fromMillis: 922572000000
   }
 }
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index a92d2447..49f28ef1 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
 
  **** Autogenerated file - DO NOT EDIT ****
 
---><timezones ianaversion="2023a">
+--><timezones ianaversion="2024a">
  <countryzones>
   <country code="ad" default="Europe/Andorra" everutc="n">
    <id>Europe/Andorra</id>
@@ -175,7 +175,7 @@
    <id notafter="73472400000" repl="America/Regina">America/Swift_Current</id>
    <id notafter="1130659200000" repl="America/Winnipeg">America/Rankin_Inlet</id>
    <id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
-   <id notafter="1604214000000" repl="America/Whitehorse">America/Dawson_Creek</id>
+   <id>America/Dawson_Creek</id>
    <id notafter="84013200000" repl="America/Dawson_Creek">America/Creston</id>
    <id notafter="1425808800000" repl="America/Dawson_Creek">America/Fort_Nelson</id>
    <id notafter="294228000000" repl="America/Edmonton">America/Inuvik</id>
@@ -331,8 +331,8 @@
   </country>
   <country code="gl" default="America/Nuuk" everutc="y">
    <id>America/Danmarkshavn</id>
-   <id>America/Scoresbysund</id>
    <id alts="America/Godthab">America/Nuuk</id>
+   <id notafter="1711846800000" repl="America/Nuuk">America/Scoresbysund</id>
    <id>America/Thule</id>
   </country>
   <country code="gm" default="Africa/Banjul" everutc="y">
@@ -459,12 +459,12 @@
   </country>
   <country code="kz" default="Asia/Almaty" everutc="n">
    <id>Asia/Almaty</id>
+   <id notafter="1709229600000" repl="Asia/Almaty">Asia/Aqtobe</id>
+   <id notafter="1545328800000" repl="Asia/Aqtobe">Asia/Qyzylorda</id>
+   <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Atyrau</id>
+   <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Aqtau</id>
    <id notafter="1099170000000" repl="Asia/Almaty">Asia/Qostanay</id>
-   <id>Asia/Oral</id>
-   <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id>
-   <id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id>
-   <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id>
-   <id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id>
+   <id notafter="922572000000" repl="Asia/Atyrau">Asia/Oral</id>
   </country>
   <country code="la" default="Asia/Vientiane" everutc="n">
    <id>Asia/Vientiane</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index fece7293..f0d19d53 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index dbd62d14..2fabed60 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index 92f4f219..628d2db2 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
diff --git a/output_data/version/tz_version b/output_data/version/tz_version
index 27585989..1bd0d828 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-005.001|2023a|001
\ No newline at end of file
+005.001|2024a|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 532566fe..ee4ae800 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -175,7 +175,7 @@
    <id notafter="73472400000" repl="America/Regina">America/Swift_Current</id>
    <id notafter="1130659200000" repl="America/Winnipeg">America/Rankin_Inlet</id>
    <id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
-   <id notafter="1604214000000" repl="America/Whitehorse">America/Dawson_Creek</id>
+   <id>America/Dawson_Creek</id>
    <id notafter="84013200000" repl="America/Dawson_Creek">America/Creston</id>
    <id notafter="1425808800000" repl="America/Dawson_Creek">America/Fort_Nelson</id>
    <id notafter="294228000000" repl="America/Edmonton">America/Inuvik</id>
@@ -331,8 +331,8 @@
   </country>
   <country code="gl" default="America/Nuuk" everutc="y">
    <id>America/Danmarkshavn</id>
-   <id>America/Scoresbysund</id>
    <id alts="America/Godthab">America/Nuuk</id>
+   <id notafter="1711846800000" repl="America/Nuuk">America/Scoresbysund</id>
    <id>America/Thule</id>
   </country>
   <country code="gm" default="Africa/Banjul" everutc="y">
@@ -459,12 +459,12 @@
   </country>
   <country code="kz" default="Asia/Almaty" everutc="n">
    <id>Asia/Almaty</id>
+   <id notafter="1709229600000" repl="Asia/Almaty">Asia/Aqtobe</id>
+   <id notafter="1545328800000" repl="Asia/Aqtobe">Asia/Qyzylorda</id>
+   <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Atyrau</id>
+   <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Aqtau</id>
    <id notafter="1099170000000" repl="Asia/Almaty">Asia/Qostanay</id>
-   <id>Asia/Oral</id>
-   <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id>
-   <id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id>
-   <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id>
-   <id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id>
+   <id notafter="922572000000" repl="Asia/Atyrau">Asia/Oral</id>
   </country>
   <country code="la" default="Asia/Vientiane" everutc="n">
    <id>Asia/Vientiane</id>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index 3b3da783..af6b425e 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index 414571cb..40dddc88 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
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 711ddef6..46482f81 100644
--- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
diff --git a/testing/data/test2/output_data/android/tzlookup.xml b/testing/data/test2/output_data/android/tzlookup.xml
index 4a466868..327157c3 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -175,7 +175,7 @@
    <id notafter="73472400000" repl="America/Regina">America/Swift_Current</id>
    <id notafter="1130659200000" repl="America/Winnipeg">America/Rankin_Inlet</id>
    <id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
-   <id notafter="1604214000000" repl="America/Whitehorse">America/Dawson_Creek</id>
+   <id>America/Dawson_Creek</id>
    <id notafter="84013200000" repl="America/Dawson_Creek">America/Creston</id>
    <id notafter="1425808800000" repl="America/Dawson_Creek">America/Fort_Nelson</id>
    <id notafter="294228000000" repl="America/Edmonton">America/Inuvik</id>
@@ -331,8 +331,8 @@
   </country>
   <country code="gl" default="America/Nuuk" everutc="y">
    <id>America/Danmarkshavn</id>
-   <id>America/Scoresbysund</id>
    <id alts="America/Godthab">America/Nuuk</id>
+   <id notafter="1711846800000" repl="America/Nuuk">America/Scoresbysund</id>
    <id>America/Thule</id>
   </country>
   <country code="gm" default="Africa/Banjul" everutc="y">
@@ -459,12 +459,12 @@
   </country>
   <country code="kz" default="Asia/Almaty" everutc="n">
    <id>Asia/Almaty</id>
+   <id notafter="1709229600000" repl="Asia/Almaty">Asia/Aqtobe</id>
+   <id notafter="1545328800000" repl="Asia/Aqtobe">Asia/Qyzylorda</id>
+   <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Atyrau</id>
+   <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Aqtau</id>
    <id notafter="1099170000000" repl="Asia/Almaty">Asia/Qostanay</id>
-   <id>Asia/Oral</id>
-   <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id>
-   <id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id>
-   <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id>
-   <id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id>
+   <id notafter="922572000000" repl="Asia/Atyrau">Asia/Oral</id>
   </country>
   <country code="la" default="Asia/Vientiane" everutc="n">
    <id>Asia/Vientiane</id>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 77200347..1c78387f 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
diff --git a/testing/data/test2/output_data/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index b1518d87..ac78122c 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
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 0e2e3aa8..8f0ec6bf 100644
--- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml
index 532566fe..ee4ae800 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -175,7 +175,7 @@
    <id notafter="73472400000" repl="America/Regina">America/Swift_Current</id>
    <id notafter="1130659200000" repl="America/Winnipeg">America/Rankin_Inlet</id>
    <id notafter="1173600000000" repl="America/Winnipeg">America/Resolute</id>
-   <id notafter="1604214000000" repl="America/Whitehorse">America/Dawson_Creek</id>
+   <id>America/Dawson_Creek</id>
    <id notafter="84013200000" repl="America/Dawson_Creek">America/Creston</id>
    <id notafter="1425808800000" repl="America/Dawson_Creek">America/Fort_Nelson</id>
    <id notafter="294228000000" repl="America/Edmonton">America/Inuvik</id>
@@ -331,8 +331,8 @@
   </country>
   <country code="gl" default="America/Nuuk" everutc="y">
    <id>America/Danmarkshavn</id>
-   <id>America/Scoresbysund</id>
    <id alts="America/Godthab">America/Nuuk</id>
+   <id notafter="1711846800000" repl="America/Nuuk">America/Scoresbysund</id>
    <id>America/Thule</id>
   </country>
   <country code="gm" default="Africa/Banjul" everutc="y">
@@ -459,12 +459,12 @@
   </country>
   <country code="kz" default="Asia/Almaty" everutc="n">
    <id>Asia/Almaty</id>
+   <id notafter="1709229600000" repl="Asia/Almaty">Asia/Aqtobe</id>
+   <id notafter="1545328800000" repl="Asia/Aqtobe">Asia/Qyzylorda</id>
+   <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Atyrau</id>
+   <id notafter="1099173600000" repl="Asia/Aqtobe">Asia/Aqtau</id>
    <id notafter="1099170000000" repl="Asia/Almaty">Asia/Qostanay</id>
-   <id>Asia/Oral</id>
-   <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtau</id>
-   <id notafter="1545328800000" repl="Asia/Oral">Asia/Qyzylorda</id>
-   <id notafter="1099173600000" repl="Asia/Oral">Asia/Aqtobe</id>
-   <id notafter="922572000000" repl="Asia/Oral">Asia/Atyrau</id>
+   <id notafter="922572000000" repl="Asia/Atyrau">Asia/Oral</id>
   </country>
   <country code="la" default="Asia/Vientiane" everutc="n">
    <id>Asia/Vientiane</id>
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index ab994e5e..9398a69c 100644
--- a/testing/data/test3/output_data/distro/distro.zip
+++ b/testing/data/test3/output_data/distro/distro.zip
diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index 414571cb..40dddc88 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
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 4794de2f..1725a5f2 100644
--- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat