From e33da553248b12496e4d18a4b16869fcce478a47 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Fri, 8 Feb 2002 01:08:50 +0000
Subject: [PATCH] ICU-1499 Change LocaleID from string -> int.

X-SVN-Rev: 7599
---
 icu4c/source/common/uloc.c                    |  18 +-
 icu4c/source/data/locales/af.txt              |   4 +-
 icu4c/source/data/locales/af_ZA.txt           |   2 +-
 icu4c/source/data/locales/ar.txt              |   2 +-
 icu4c/source/data/locales/ar_AE.txt           |   2 +-
 icu4c/source/data/locales/ar_BH.txt           |   2 +-
 icu4c/source/data/locales/ar_DZ.txt           |   2 +-
 icu4c/source/data/locales/ar_EG.txt           |   2 +-
 icu4c/source/data/locales/ar_IQ.txt           |   2 +-
 icu4c/source/data/locales/ar_JO.txt           |   2 +-
 icu4c/source/data/locales/ar_KW.txt           |   2 +-
 icu4c/source/data/locales/ar_LB.txt           |   2 +-
 icu4c/source/data/locales/ar_LY.txt           |   2 +-
 icu4c/source/data/locales/ar_MA.txt           |   2 +-
 icu4c/source/data/locales/ar_OM.txt           |   2 +-
 icu4c/source/data/locales/ar_QA.txt           |   2 +-
 icu4c/source/data/locales/ar_SA.txt           |   2 +-
 icu4c/source/data/locales/ar_SY.txt           |   2 +-
 icu4c/source/data/locales/ar_TN.txt           |   2 +-
 icu4c/source/data/locales/ar_YE.txt           |   2 +-
 icu4c/source/data/locales/az.txt              | 158 ++++++++-------
 icu4c/source/data/locales/az_AZ.txt           |  48 ++---
 icu4c/source/data/locales/be.txt              |   2 +-
 icu4c/source/data/locales/be_BY.txt           |   2 +-
 icu4c/source/data/locales/bg.txt              |   2 +-
 icu4c/source/data/locales/bg_BG.txt           |   2 +-
 icu4c/source/data/locales/bn.txt              |   4 +-
 icu4c/source/data/locales/bn_IN.txt           |   2 +-
 icu4c/source/data/locales/ca.txt              |   2 +-
 icu4c/source/data/locales/ca_ES.txt           |   2 +-
 icu4c/source/data/locales/cs.txt              |   2 +-
 icu4c/source/data/locales/cs_CZ.txt           |   2 +-
 icu4c/source/data/locales/da.txt              |   2 +-
 icu4c/source/data/locales/da_DK.txt           |   2 +-
 icu4c/source/data/locales/de.txt              |   4 +-
 icu4c/source/data/locales/de_AT.txt           |   2 +-
 icu4c/source/data/locales/de_BE.txt           | 180 +++++++++--------
 icu4c/source/data/locales/de_CH.txt           |   2 +-
 icu4c/source/data/locales/de_DE.txt           |   2 +-
 icu4c/source/data/locales/de_LI.txt           |  20 +-
 icu4c/source/data/locales/de_LU.txt           |   2 +-
 icu4c/source/data/locales/de__PHONEBOOK.txt   |   8 +-
 icu4c/source/data/locales/div.txt             | 181 +++++++++---------
 icu4c/source/data/locales/div_MV.txt          |  16 +-
 icu4c/source/data/locales/el.txt              |   2 +-
 icu4c/source/data/locales/el_GR.txt           |   2 +-
 icu4c/source/data/locales/en.txt              |   2 +-
 icu4c/source/data/locales/en_AS.txt           |  26 +--
 icu4c/source/data/locales/en_AU.txt           |   2 +-
 icu4c/source/data/locales/en_BZ.txt           |  51 +++--
 icu4c/source/data/locales/en_CA.txt           |   2 +-
 icu4c/source/data/locales/en_GB.txt           |   2 +-
 icu4c/source/data/locales/en_GU.txt           |  26 +--
 icu4c/source/data/locales/en_IE.txt           |   2 +-
 icu4c/source/data/locales/en_JM.txt           |  20 +-
 icu4c/source/data/locales/en_MH.txt           |  26 +--
 icu4c/source/data/locales/en_MP.txt           |  26 +--
 icu4c/source/data/locales/en_NZ.txt           |   2 +-
 icu4c/source/data/locales/en_PH.txt           |   2 +-
 icu4c/source/data/locales/en_TT.txt           |  20 +-
 icu4c/source/data/locales/en_UM.txt           |  26 +--
 icu4c/source/data/locales/en_US.txt           |   2 +-
 icu4c/source/data/locales/en_US_POSIX.txt     |   2 +-
 icu4c/source/data/locales/en_VI.txt           |   2 +-
 icu4c/source/data/locales/en_ZA.txt           |   2 +-
 icu4c/source/data/locales/en_ZW.txt           |   2 +-
 icu4c/source/data/locales/es.txt              |   2 +-
 icu4c/source/data/locales/es_AR.txt           |   2 +-
 icu4c/source/data/locales/es_BO.txt           |   2 +-
 icu4c/source/data/locales/es_CL.txt           |   2 +-
 icu4c/source/data/locales/es_CO.txt           |   2 +-
 icu4c/source/data/locales/es_CR.txt           |   2 +-
 icu4c/source/data/locales/es_DO.txt           |   2 +-
 icu4c/source/data/locales/es_EC.txt           |   2 +-
 icu4c/source/data/locales/es_ES.txt           |   2 +-
 icu4c/source/data/locales/es_GT.txt           |   2 +-
 icu4c/source/data/locales/es_HN.txt           |   2 +-
 icu4c/source/data/locales/es_MX.txt           |   2 +-
 icu4c/source/data/locales/es_NI.txt           |   2 +-
 icu4c/source/data/locales/es_PA.txt           |   2 +-
 icu4c/source/data/locales/es_PE.txt           |   2 +-
 icu4c/source/data/locales/es_PR.txt           |   2 +-
 icu4c/source/data/locales/es_PY.txt           |   2 +-
 icu4c/source/data/locales/es_SV.txt           |   2 +-
 icu4c/source/data/locales/es_UY.txt           |   2 +-
 icu4c/source/data/locales/es_VE.txt           |   2 +-
 icu4c/source/data/locales/es__TRADITIONAL.txt |   2 +-
 icu4c/source/data/locales/et.txt              |   2 +-
 icu4c/source/data/locales/et_EE.txt           |   2 +-
 icu4c/source/data/locales/eu.txt              |   2 +-
 icu4c/source/data/locales/eu_ES.txt           |   2 +-
 icu4c/source/data/locales/fa.txt              |   2 +-
 icu4c/source/data/locales/fa_IR.txt           |   2 +-
 icu4c/source/data/locales/fi.txt              |   2 +-
 icu4c/source/data/locales/fi_FI.txt           |   2 +-
 icu4c/source/data/locales/fo.txt              |   2 +-
 icu4c/source/data/locales/fo_FO.txt           |   2 +-
 icu4c/source/data/locales/fr.txt              |   2 +-
 icu4c/source/data/locales/fr_BE.txt           |   2 +-
 icu4c/source/data/locales/fr_CA.txt           |   2 +-
 icu4c/source/data/locales/fr_CH.txt           |   2 +-
 icu4c/source/data/locales/fr_FR.txt           |   2 +-
 icu4c/source/data/locales/fr_LU.txt           |   2 +-
 icu4c/source/data/locales/fr_MC.txt           |   2 +-
 icu4c/source/data/locales/gl.txt              |   2 +-
 icu4c/source/data/locales/gl_ES.txt           |   2 +-
 icu4c/source/data/locales/gu.txt              | 163 ++++++++--------
 icu4c/source/data/locales/gu_IN.txt           |   4 +-
 icu4c/source/data/locales/he.txt              |   2 +-
 icu4c/source/data/locales/he_IL.txt           |   2 +-
 icu4c/source/data/locales/hi.txt              |   2 +-
 icu4c/source/data/locales/hi_IN.txt           |   2 +-
 icu4c/source/data/locales/hr.txt              |   2 +-
 icu4c/source/data/locales/hr_HR.txt           |   2 +-
 icu4c/source/data/locales/hu.txt              |   2 +-
 icu4c/source/data/locales/hu_HU.txt           |   2 +-
 icu4c/source/data/locales/hy.txt              | 181 +++++++++---------
 icu4c/source/data/locales/hy_AM.txt           |  14 +-
 icu4c/source/data/locales/hy_AM_REVISED.txt   |  93 +++++----
 icu4c/source/data/locales/id.txt              |  18 +-
 icu4c/source/data/locales/id_ID.txt           |   2 +-
 icu4c/source/data/locales/is.txt              |   2 +-
 icu4c/source/data/locales/is_IS.txt           |   2 +-
 icu4c/source/data/locales/it.txt              |   2 +-
 icu4c/source/data/locales/it_CH.txt           |   2 +-
 icu4c/source/data/locales/it_IT.txt           |   2 +-
 icu4c/source/data/locales/ja.txt              |   2 +-
 icu4c/source/data/locales/ja_JP.txt           |   2 +-
 icu4c/source/data/locales/ka.txt              | 150 +++++++--------
 icu4c/source/data/locales/ka_GE.txt           |  56 +++---
 icu4c/source/data/locales/kk.txt              | 128 ++++++-------
 icu4c/source/data/locales/kk_KZ.txt           |  27 +--
 icu4c/source/data/locales/kn.txt              | 172 ++++++++---------
 icu4c/source/data/locales/kn_IN.txt           |   2 +-
 icu4c/source/data/locales/ko.txt              |   2 +-
 icu4c/source/data/locales/ko_KR.txt           |   2 +-
 icu4c/source/data/locales/kok.txt             |   2 +-
 icu4c/source/data/locales/kok_IN.txt          |   2 +-
 icu4c/source/data/locales/ky.txt              | 156 ++++++++-------
 icu4c/source/data/locales/ky_KG.txt           |  48 ++---
 icu4c/source/data/locales/lt.txt              |   2 +-
 icu4c/source/data/locales/lt_LT.txt           |   2 +-
 icu4c/source/data/locales/lv.txt              |   2 +-
 icu4c/source/data/locales/lv_LV.txt           |   2 +-
 icu4c/source/data/locales/mk.txt              |   2 +-
 icu4c/source/data/locales/mk_MK.txt           |   2 +-
 icu4c/source/data/locales/mn.txt              | 156 ++++++++-------
 icu4c/source/data/locales/mn_MN.txt           |  48 ++---
 icu4c/source/data/locales/mr.txt              |   2 +-
 icu4c/source/data/locales/mr_IN.txt           |   2 +-
 icu4c/source/data/locales/ms.txt              |  98 +++++-----
 icu4c/source/data/locales/ms_BN.txt           |  47 ++---
 icu4c/source/data/locales/ms_MY.txt           |  71 +++----
 icu4c/source/data/locales/mt.txt              |   2 +-
 icu4c/source/data/locales/mt_MT.txt           |   2 +-
 icu4c/source/data/locales/nb.txt              |   2 +-
 icu4c/source/data/locales/nb_NO.txt           |   2 +-
 icu4c/source/data/locales/nl.txt              |   2 +-
 icu4c/source/data/locales/nl_BE.txt           |   2 +-
 icu4c/source/data/locales/nl_NL.txt           |   2 +-
 icu4c/source/data/locales/nn.txt              |   2 +-
 icu4c/source/data/locales/nn_NO.txt           |   2 +-
 icu4c/source/data/locales/pa.txt              | 176 ++++++++---------
 icu4c/source/data/locales/pa_IN.txt           |   2 +-
 icu4c/source/data/locales/pl.txt              |   2 +-
 icu4c/source/data/locales/pl_PL.txt           |   2 +-
 icu4c/source/data/locales/pt.txt              |   2 +-
 icu4c/source/data/locales/pt_BR.txt           |   2 +-
 icu4c/source/data/locales/pt_PT.txt           |   2 +-
 icu4c/source/data/locales/ro.txt              |   2 +-
 icu4c/source/data/locales/ro_RO.txt           |   2 +-
 icu4c/source/data/locales/root.txt            |   2 +-
 icu4c/source/data/locales/ru.txt              |   2 +-
 icu4c/source/data/locales/ru_RU.txt           |   2 +-
 icu4c/source/data/locales/sa.txt              | 174 ++++++++---------
 icu4c/source/data/locales/sa_IN.txt           |   2 +-
 icu4c/source/data/locales/sh.txt              |   2 +-
 icu4c/source/data/locales/sh_YU.txt           |   2 +-
 icu4c/source/data/locales/sk.txt              |   2 +-
 icu4c/source/data/locales/sk_SK.txt           |   2 +-
 icu4c/source/data/locales/sl.txt              |   2 +-
 icu4c/source/data/locales/sl_SI.txt           |   2 +-
 icu4c/source/data/locales/sq.txt              |   2 +-
 icu4c/source/data/locales/sq_AL.txt           |   2 +-
 icu4c/source/data/locales/sr.txt              |   2 +-
 icu4c/source/data/locales/sr_YU.txt           |   2 +-
 icu4c/source/data/locales/sv.txt              |   2 +-
 icu4c/source/data/locales/sv_FI.txt           |   2 +-
 icu4c/source/data/locales/sv_SE.txt           |   2 +-
 icu4c/source/data/locales/sw.txt              |   2 +-
 icu4c/source/data/locales/sw_KE.txt           |   2 +-
 icu4c/source/data/locales/syr.txt             | 158 ++++++++-------
 icu4c/source/data/locales/syr_SY.txt          |  56 +++---
 icu4c/source/data/locales/ta.txt              |   2 +-
 icu4c/source/data/locales/ta_IN.txt           |   2 +-
 icu4c/source/data/locales/te.txt              |   4 +-
 icu4c/source/data/locales/te_IN.txt           |   4 +-
 icu4c/source/data/locales/th.txt              |   8 +-
 icu4c/source/data/locales/th_TH.txt           |   2 +-
 icu4c/source/data/locales/tr.txt              |   2 +-
 icu4c/source/data/locales/tr_TR.txt           |   2 +-
 icu4c/source/data/locales/tt.txt              | 155 ++++++++-------
 icu4c/source/data/locales/uk.txt              |   2 +-
 icu4c/source/data/locales/uk_UA.txt           |   2 +-
 icu4c/source/data/locales/ur.txt              | 154 ++++++++-------
 icu4c/source/data/locales/ur_PK.txt           |  48 ++---
 icu4c/source/data/locales/uz.txt              | 150 +++++++--------
 icu4c/source/data/locales/uz_UZ.txt           |  42 ++--
 icu4c/source/data/locales/vi.txt              |   2 +-
 icu4c/source/data/locales/vi_VN.txt           |   2 +-
 icu4c/source/data/locales/zh.txt              |   2 +-
 icu4c/source/data/locales/zh_CN.txt           |   2 +-
 icu4c/source/data/locales/zh_HK.txt           |   2 +-
 icu4c/source/data/locales/zh_MO.txt           |   2 +-
 icu4c/source/data/locales/zh_SG.txt           |   4 +-
 icu4c/source/data/locales/zh_TW.txt           |   2 +-
 icu4c/source/test/cintltst/cloctst.c          |   9 +-
 icu4c/source/test/cintltst/creststn.c         |  10 +-
 icu4c/source/tools/gencnval/gencnval.c        |  30 +--
 219 files changed, 1993 insertions(+), 2013 deletions(-)

diff --git a/icu4c/source/common/uloc.c b/icu4c/source/common/uloc.c
index d584712e126..d305132d9d2 100644
--- a/icu4c/source/common/uloc.c
+++ b/icu4c/source/common/uloc.c
@@ -798,22 +798,22 @@ U_CAPI uint32_t  U_EXPORT2
 uloc_getLCID(const char* localeID) 
 {
     UErrorCode err = U_ZERO_ERROR;
-    char temp[30];
-    const UChar* lcid = NULL;
-    int32_t lcidLen = 0;
     uint32_t result = 0;
     UResourceBundle* bundle = ures_open(NULL, localeID, &err);
     
     if (U_SUCCESS(err))
     {
-        lcid = ures_getStringByKey(bundle, _kLocaleID, &lcidLen, &err);
-        ures_close(bundle);
-        if (U_FAILURE(err) || !lcid || lcidLen == 0)
+        UResourceBundle *localeID = ures_getByKey(bundle, _kLocaleID, NULL, &err);
+        if (U_SUCCESS(err))
         {
-            return 0;
+            result = ures_getInt(localeID, &err);
+            if (U_FAILURE(err))
+            {
+                result = 0;
+            }
+            ures_close(localeID);
         }
-        u_UCharsToChars(lcid, temp, lcidLen + 1);
-        result = (uint32_t)T_CString_stringToInteger(temp, 16);
+        ures_close(bundle);
     }
     
     return result;
diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt
index 13023ff136b..3794691822c 100644
--- a/icu4c/source/data/locales/af.txt
+++ b/icu4c/source/data/locales/af.txt
@@ -6,7 +6,7 @@
 // ***************************************************************************
 
 af {
-    Version { "1.0" }
+    Version { "2.0" }
 
     AmPmMarkers { 
         "VM",
@@ -72,7 +72,7 @@ af {
         "\u221e",
         "\ufffd",
     }
-    LocaleID {"36"}
+    LocaleID:int { 0x36 }
 //    LocaleScript{ 
 //                "Latn",  // ISO 15924 Name 
 //    }
diff --git a/icu4c/source/data/locales/af_ZA.txt b/icu4c/source/data/locales/af_ZA.txt
index 772989fcb0f..02751fa4713 100644
--- a/icu4c/source/data/locales/af_ZA.txt
+++ b/icu4c/source/data/locales/af_ZA.txt
@@ -30,7 +30,7 @@ af_ZA {
         "#,##0%",
         "#E0",
     }
-    LocaleID {"0436"}
+    LocaleID:int { 0x0436 }
 //    LocaleString { "af_ZA" }
 //    ShortCountry{ "ZAK" }
 }
diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt
index 66287937597..a3d899d099d 100644
--- a/icu4c/source/data/locales/ar.txt
+++ b/icu4c/source/data/locales/ar.txt
@@ -87,7 +87,7 @@ ar {
     Languages { 
         ar { "\u0627\u0644\u0639\u0631\u0628\u064A\u0629" }
     }
-    LocaleID { "01" }
+    LocaleID:int { 0x01 }
 //    LocaleString { "ar" }
     MonthAbbreviations { 
         "\u064A\u0646\u0627",
diff --git a/icu4c/source/data/locales/ar_AE.txt b/icu4c/source/data/locales/ar_AE.txt
index ddc7f805eb8..bc6170f4370 100644
--- a/icu4c/source/data/locales/ar_AE.txt
+++ b/icu4c/source/data/locales/ar_AE.txt
@@ -14,5 +14,5 @@ ar_AE {
     }
 //    LocaleString { "ar_AE" }
 //    ShortCountry { "ARE" }
-    LocaleID { "3801" }
+    LocaleID:int { 0x3801 }
 }
diff --git a/icu4c/source/data/locales/ar_BH.txt b/icu4c/source/data/locales/ar_BH.txt
index 545e32efedc..79b70613f8e 100644
--- a/icu4c/source/data/locales/ar_BH.txt
+++ b/icu4c/source/data/locales/ar_BH.txt
@@ -14,5 +14,5 @@ ar_BH {
     }
 //    LocaleString { "ar_BH" }
 //    ShortCountry { "BHR" }
-    LocaleID { "3c01" }
+    LocaleID:int { 0x3c01 }
 }
diff --git a/icu4c/source/data/locales/ar_DZ.txt b/icu4c/source/data/locales/ar_DZ.txt
index d8aca325bc2..595ca48fe24 100644
--- a/icu4c/source/data/locales/ar_DZ.txt
+++ b/icu4c/source/data/locales/ar_DZ.txt
@@ -14,5 +14,5 @@ ar_DZ {
     }
 //    LocaleString { "ar_DZ" }
 //    ShortCountry { "DZA" }
-    LocaleID { "1401" }
+    LocaleID:int { 0x1401 }
 }
diff --git a/icu4c/source/data/locales/ar_EG.txt b/icu4c/source/data/locales/ar_EG.txt
index 236b60d3945..f1fa5cb77cb 100644
--- a/icu4c/source/data/locales/ar_EG.txt
+++ b/icu4c/source/data/locales/ar_EG.txt
@@ -14,5 +14,5 @@ ar_EG {
     }
 //    LocaleString { "ar_EG" }
 //    ShortCountry { "EGY" }
-    LocaleID { "0c01" }
+    LocaleID:int { 0x0c01 }
 }
diff --git a/icu4c/source/data/locales/ar_IQ.txt b/icu4c/source/data/locales/ar_IQ.txt
index ec8848d5034..70239576d74 100644
--- a/icu4c/source/data/locales/ar_IQ.txt
+++ b/icu4c/source/data/locales/ar_IQ.txt
@@ -20,5 +20,5 @@ ar_IQ {
     }
 //    LocaleString { "ar_IQ" }
 //    ShortCountry { "IRQ" }
-    LocaleID { "0801" }
+    LocaleID:int { 0x0801 }
 }
diff --git a/icu4c/source/data/locales/ar_JO.txt b/icu4c/source/data/locales/ar_JO.txt
index c84f7c1e2e9..10c4e2794af 100644
--- a/icu4c/source/data/locales/ar_JO.txt
+++ b/icu4c/source/data/locales/ar_JO.txt
@@ -51,7 +51,7 @@ ar_JO {
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
     }
 //    ShortCountry { "JOR" }
-    LocaleID { "2c01" }
+    LocaleID:int { 0x2c01 }
     NumberPatterns { 
         "#,##0.###;#,##0.###-",
         "\u00A4 #,##0.000;\u00A4 #,##0.000-",
diff --git a/icu4c/source/data/locales/ar_KW.txt b/icu4c/source/data/locales/ar_KW.txt
index 6bfbe6f4be1..d6136ab7ff6 100644
--- a/icu4c/source/data/locales/ar_KW.txt
+++ b/icu4c/source/data/locales/ar_KW.txt
@@ -14,7 +14,7 @@ ar_KW {
     }
 //    LocaleString { "ar_KW" }
 //    ShortCountry { "KWT" }
-    LocaleID { "3401" }
+    LocaleID:int { 0x3401 }
     NumberPatterns { 
         "#,##0.###;#,##0.###-",
         "\u00A4 #,##0.000;\u00A4 #,##0.000-",
diff --git a/icu4c/source/data/locales/ar_LB.txt b/icu4c/source/data/locales/ar_LB.txt
index 14feedc00fb..28129648968 100644
--- a/icu4c/source/data/locales/ar_LB.txt
+++ b/icu4c/source/data/locales/ar_LB.txt
@@ -51,5 +51,5 @@ ar_LB {
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
     }
 //    ShortCountry { "LBN" }
-    LocaleID { "3001" }
+    LocaleID:int { 0x3001 }
 }
diff --git a/icu4c/source/data/locales/ar_LY.txt b/icu4c/source/data/locales/ar_LY.txt
index 2224003f0f3..42ac92d5b15 100644
--- a/icu4c/source/data/locales/ar_LY.txt
+++ b/icu4c/source/data/locales/ar_LY.txt
@@ -20,5 +20,5 @@ ar_LY {
     }
 //    LocaleString { "ar_LY" }
 //    ShortCountry { "LBY" }
-    LocaleID { "1001" }
+    LocaleID:int { 0x1001 }
 }
diff --git a/icu4c/source/data/locales/ar_MA.txt b/icu4c/source/data/locales/ar_MA.txt
index 1d8e58d49d0..d527bd5a1a0 100644
--- a/icu4c/source/data/locales/ar_MA.txt
+++ b/icu4c/source/data/locales/ar_MA.txt
@@ -14,5 +14,5 @@ ar_MA {
     }
 //    LocaleString { "ar_MA" }
 //    ShortCountry { "MAR" }
-    LocaleID { "1801" }
+    LocaleID:int { 0x1801 }
 }
diff --git a/icu4c/source/data/locales/ar_OM.txt b/icu4c/source/data/locales/ar_OM.txt
index 13a84d8e531..6f4a772a171 100644
--- a/icu4c/source/data/locales/ar_OM.txt
+++ b/icu4c/source/data/locales/ar_OM.txt
@@ -14,5 +14,5 @@ ar_OM {
     }
 //    LocaleString { "ar_OM" }
 //    ShortCountry { "OMN" }
-    LocaleID { "2001" }
+    LocaleID:int { 0x2001 }
 }
diff --git a/icu4c/source/data/locales/ar_QA.txt b/icu4c/source/data/locales/ar_QA.txt
index 7207ea16c41..1f135fa278c 100644
--- a/icu4c/source/data/locales/ar_QA.txt
+++ b/icu4c/source/data/locales/ar_QA.txt
@@ -14,5 +14,5 @@ ar_QA {
     }
 //    LocaleString { "ar_QA" }
 //    ShortCountry { "QAT" }
-    LocaleID { "4001" }
+    LocaleID:int { 0x4001 }
 }
diff --git a/icu4c/source/data/locales/ar_SA.txt b/icu4c/source/data/locales/ar_SA.txt
index d2f0c52afad..053db6c7611 100644
--- a/icu4c/source/data/locales/ar_SA.txt
+++ b/icu4c/source/data/locales/ar_SA.txt
@@ -14,5 +14,5 @@ ar_SA {
     }
 //    LocaleString { "ar_SA" }
 //    ShortCountry { "SAU" }
-    LocaleID { "0401" }
+    LocaleID:int { 0x0401 }
 }
diff --git a/icu4c/source/data/locales/ar_SY.txt b/icu4c/source/data/locales/ar_SY.txt
index c9138959001..7b96cd8bf81 100644
--- a/icu4c/source/data/locales/ar_SY.txt
+++ b/icu4c/source/data/locales/ar_SY.txt
@@ -51,5 +51,5 @@ ar_SY {
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
     }
 //    ShortCountry { "SYR" }
-    LocaleID { "2801" }
+    LocaleID:int { 0x2801 }
 }
diff --git a/icu4c/source/data/locales/ar_TN.txt b/icu4c/source/data/locales/ar_TN.txt
index a1def2ae9d2..7b0365eaee5 100644
--- a/icu4c/source/data/locales/ar_TN.txt
+++ b/icu4c/source/data/locales/ar_TN.txt
@@ -20,5 +20,5 @@ ar_TN {
     }
 //    LocaleString { "ar_TN" }
 //    ShortCountry { "TUN" }
-    LocaleID { "1c01" }
+    LocaleID:int { 0x1c01 }
 }
diff --git a/icu4c/source/data/locales/ar_YE.txt b/icu4c/source/data/locales/ar_YE.txt
index 0f72b6da7c4..4838e294016 100644
--- a/icu4c/source/data/locales/ar_YE.txt
+++ b/icu4c/source/data/locales/ar_YE.txt
@@ -14,5 +14,5 @@ ar_YE {
     }
 //    LocaleString { "ar_YE" }
 //    ShortCountry { "YEM" }
-    LocaleID { "2401" }
+    LocaleID:int { 0x2401 }
 }
diff --git a/icu4c/source/data/locales/az.txt b/icu4c/source/data/locales/az.txt
index a2bd1498fab..f6068381f2c 100644
--- a/icu4c/source/data/locales/az.txt
+++ b/icu4c/source/data/locales/az.txt
@@ -1,87 +1,85 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 az{
- Version{ "x0.1" }
- LocaleID{ "2c"}
- ShortLanguage{
-  "AZE"
- }
- DayNames{
-  "\u0411\u0430\u0437\u0430\u0440",
-  "\u0411\u0430\u0437\u0430\u0440\u00A0\u0435\u0440\u0442\u04D9\u0441\u0438",
-  "\u0427\u04D9\u0440\u0448\u04D9\u043D\u0431\u04D9\u00A0\u0430\u0445\u0448\u0430\u043C\u044B",
-  "\u0427\u04D9\u0440\u0448\u04D9\u043D\u0431\u04D9",
-  "\u04B8\u04AF\u043C\u04D9\u00A0\u0430\u0445\u0448\u0430\u043C\u044B",
-  "\u04B8\u04AF\u043C\u04D9",
-  "\u0428\u04D9\u043D\u0431\u04D9"
- }
-
- DayAbbreviations{
-  "\u0411",
-  "\u0411\u0435",
-  "\u0427\u0430",
-  "\u0427",
-  "\u04B8\u0430",
-  "\u04B8",
-  "\u0428"
- }
-
- MonthNames{
-  "\u0408\u0430\u043D\u0432\u0430\u0440",
-  "\u0424\u0435\u0432\u0440\u0430\u043B",
-  "\u041C\u0430\u0440\u0442",
-  "\u0410\u043F\u0440\u0435\u043B",
-  "\u041C\u0430\u0458",
-  "\u0418\u0458\u0443\u043D",
-  "\u0418\u0458\u0443\u043B",
-  "\u0410\u0432\u0433\u0443\u0441\u0442",
-  "\u0421\u0435\u043D\u0442\u0458\u0430\u0431\u0440",
-  "\u041E\u043A\u0442\u0458\u0430\u0431\u0440",
-  "\u041D\u043E\u0458\u0430\u0431\u0440",
-  "\u0414\u0435\u043A\u0430\u0431\u0440",
-  ""
- }
-
- MonthAbbreviations{
-  "\u0408\u0430\u043D",
-  "\u0424\u0435\u0432",
-  "\u041C\u0430\u0440",
-  "\u0410\u043F\u0440",
-  "\u041C\u0430\u0458",
-  "\u0418\u0458\u0443\u043D",
-  "\u0418\u0458\u0443\u043B",
-  "\u0410\u0432\u0433",
-  "\u0421\u0435\u043D",
-  "\u041E\u043A\u0442",
-  "\u041D\u043E\u044F",
-  "\u0414\u0435\u043A",
-  ""
- }
-
- NumberElements{
-  ",",
-  "\u00A0",
-  ";",
-  "%",
-  ";",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
-
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.1" }
+    LocaleID:int { 0x2c }
+//    ShortLanguage{
+//        "AZE"
+//    }
+    DayNames{
+        "\u0411\u0430\u0437\u0430\u0440",
+        "\u0411\u0430\u0437\u0430\u0440\u00A0\u0435\u0440\u0442\u04D9\u0441\u0438",
+        "\u0427\u04D9\u0440\u0448\u04D9\u043D\u0431\u04D9\u00A0\u0430\u0445\u0448\u0430\u043C\u044B",
+        "\u0427\u04D9\u0440\u0448\u04D9\u043D\u0431\u04D9",
+        "\u04B8\u04AF\u043C\u04D9\u00A0\u0430\u0445\u0448\u0430\u043C\u044B",
+        "\u04B8\u04AF\u043C\u04D9",
+        "\u0428\u04D9\u043D\u0431\u04D9"
     }
- }
- LocaleScript{ "CYRL" }
+
+    DayAbbreviations{
+        "\u0411",
+        "\u0411\u0435",
+        "\u0427\u0430",
+        "\u0427",
+        "\u04B8\u0430",
+        "\u04B8",
+        "\u0428"
+    }
+
+    MonthNames{
+        "\u0408\u0430\u043D\u0432\u0430\u0440",
+        "\u0424\u0435\u0432\u0440\u0430\u043B",
+        "\u041C\u0430\u0440\u0442",
+        "\u0410\u043F\u0440\u0435\u043B",
+        "\u041C\u0430\u0458",
+        "\u0418\u0458\u0443\u043D",
+        "\u0418\u0458\u0443\u043B",
+        "\u0410\u0432\u0433\u0443\u0441\u0442",
+        "\u0421\u0435\u043D\u0442\u0458\u0430\u0431\u0440",
+        "\u041E\u043A\u0442\u0458\u0430\u0431\u0440",
+        "\u041D\u043E\u0458\u0430\u0431\u0440",
+        "\u0414\u0435\u043A\u0430\u0431\u0440",
+    }
+
+    MonthAbbreviations{
+        "\u0408\u0430\u043D",
+        "\u0424\u0435\u0432",
+        "\u041C\u0430\u0440",
+        "\u0410\u043F\u0440",
+        "\u041C\u0430\u0458",
+        "\u0418\u0458\u0443\u043D",
+        "\u0418\u0458\u0443\u043B",
+        "\u0410\u0432\u0433",
+        "\u0421\u0435\u043D",
+        "\u041E\u043A\u0442",
+        "\u041D\u043E\u044F",
+        "\u0414\u0435\u043A",
+    }
+
+    NumberElements{
+        ",",
+        "\u00A0",
+        ";",
+        "%",
+        ";",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+             "[normalization on]"
+        }
+    }
+    LocaleScript:array{ "CYRL" }
 }
diff --git a/icu4c/source/data/locales/az_AZ.txt b/icu4c/source/data/locales/az_AZ.txt
index d80718e87f9..43b19aac600 100644
--- a/icu4c/source/data/locales/az_AZ.txt
+++ b/icu4c/source/data/locales/az_AZ.txt
@@ -1,31 +1,31 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 az_AZ {
- Version{ "x0.1" }
- LocaleID{ "082C"}
- ShortCountry{
-  "AZE"
- }
- CurrencyElements{
-  "\u043C\u0430\u043D.",
-  "AZM",
-  ","
- }
+    Version{ "x0.1" }
+    LocaleID:int { 0x082C }
+//    ShortCountry{
+//    "AZE"
+//    }
+    CurrencyElements{
+        "\u043C\u0430\u043D.",
+        "AZM",
+        ","
+    }
 
- DateTimePatterns{
-  "hh:mm:ss a",
-  "hh:mm:ss a",
-  "H:mm:ss",
-  "H:mm:ss",
-  "d MMMM yyyy",
-  "d MMMM yyyy",
-  "dd.MM.yyyy",
-  "dd.MM.yyyy",
-  "{1} {0}"
- }
+    DateTimePatterns{
+        "hh:mm:ss a",
+        "hh:mm:ss a",
+        "H:mm:ss",
+        "H:mm:ss",
+        "d MMMM yyyy",
+        "d MMMM yyyy",
+        "dd.MM.yyyy",
+        "dd.MM.yyyy",
+        "{1} {0}"
+    }
 }
diff --git a/icu4c/source/data/locales/be.txt b/icu4c/source/data/locales/be.txt
index 488c21d9045..669f7d33421 100644
--- a/icu4c/source/data/locales/be.txt
+++ b/icu4c/source/data/locales/be.txt
@@ -54,7 +54,7 @@ be {
     Languages { 
         be { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u043A\u0456" }
     }
-    LocaleID { "23" }
+    LocaleID:int { 0x23 }
 //    LocaleString { "be" }
     MonthAbbreviations { 
         "\u0421\u0442\u0443",
diff --git a/icu4c/source/data/locales/be_BY.txt b/icu4c/source/data/locales/be_BY.txt
index 0319d7bf0e6..66340100563 100644
--- a/icu4c/source/data/locales/be_BY.txt
+++ b/icu4c/source/data/locales/be_BY.txt
@@ -20,5 +20,5 @@ be_BY {
         "#E0",
     }
 //    ShortCountry { "BLR" }
-    LocaleID { "0423" }
+    LocaleID:int { 0x0423 }
 }
diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt
index 6d826d42c52..2ff62367fd6 100644
--- a/icu4c/source/data/locales/bg.txt
+++ b/icu4c/source/data/locales/bg.txt
@@ -84,7 +84,7 @@ bg {
     Languages { 
         bg { "\u0431\u044A\u043B\u0433\u0430\u0440\u0441\u043A\u0438" }
     }
-    LocaleID { "02" }
+    LocaleID:int { 0x02 }
 //    LocaleString { "bg" }
     MonthAbbreviations { 
         "\u044f\u043d.",
diff --git a/icu4c/source/data/locales/bg_BG.txt b/icu4c/source/data/locales/bg_BG.txt
index e06f515e810..b34955fc2f9 100644
--- a/icu4c/source/data/locales/bg_BG.txt
+++ b/icu4c/source/data/locales/bg_BG.txt
@@ -20,5 +20,5 @@ bg_BG {
         "#E0",
     }
 //    ShortCountry { "BGR" }
-    LocaleID { "0402" }
+    LocaleID:int { 0x0402 }
 }
diff --git a/icu4c/source/data/locales/bn.txt b/icu4c/source/data/locales/bn.txt
index 94780d28509..5ab100d5c79 100644
--- a/icu4c/source/data/locales/bn.txt
+++ b/icu4c/source/data/locales/bn.txt
@@ -59,8 +59,8 @@ bn {
         "\u09A1\u09BF\u09B8\u09C7\u09AE\u09CD\u09AC\u09B0",
     }
     //LocaleString { "bn" }
-    LocaleID { "45" }
+    LocaleID:int { 0x45 }
     LocaleScript:array{
-            "Beng"
+        "Beng"
     }
 }
diff --git a/icu4c/source/data/locales/bn_IN.txt b/icu4c/source/data/locales/bn_IN.txt
index bc1ea58282f..087f4933b6e 100644
--- a/icu4c/source/data/locales/bn_IN.txt
+++ b/icu4c/source/data/locales/bn_IN.txt
@@ -44,5 +44,5 @@ bn_IN {
         "#E0",
     }
 //    LocaleString { "bn_IN" }
-    LocaleID { "0445" }
+    LocaleID:int { 0x0445 }
 }
diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt
index 89addd2a805..1fdb937670b 100644
--- a/icu4c/source/data/locales/ca.txt
+++ b/icu4c/source/data/locales/ca.txt
@@ -48,7 +48,7 @@ ca {
     Languages { 
         ca { "catal\u00E0" }
     }
-    LocaleID { "03" }
+    LocaleID:int { 0x03 }
 //    LocaleString { "ca" }
     MonthAbbreviations { 
         "gen.",
diff --git a/icu4c/source/data/locales/ca_ES.txt b/icu4c/source/data/locales/ca_ES.txt
index 2ef3a22b26c..df6a355545a 100644
--- a/icu4c/source/data/locales/ca_ES.txt
+++ b/icu4c/source/data/locales/ca_ES.txt
@@ -20,5 +20,5 @@ ca_ES {
     }
 //    LocaleString { "ca_ES" }
 //    ShortCountry { "ESP" }
-    LocaleID { "0403" }
+    LocaleID:int { 0x0403 }
 }
diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt
index 04c79c2a9b8..190a43563ec 100644
--- a/icu4c/source/data/locales/cs.txt
+++ b/icu4c/source/data/locales/cs.txt
@@ -56,7 +56,7 @@ cs {
     Languages { 
         cs { "\u010De\u0161tina" }
     }
-    LocaleID { "05" }
+    LocaleID:int { 0x05 }
 //    LocaleString { "cs" }
     MonthAbbreviations { 
         "I",
diff --git a/icu4c/source/data/locales/cs_CZ.txt b/icu4c/source/data/locales/cs_CZ.txt
index 18eb3fef67e..3f454368b26 100644
--- a/icu4c/source/data/locales/cs_CZ.txt
+++ b/icu4c/source/data/locales/cs_CZ.txt
@@ -20,5 +20,5 @@ cs_CZ {
         "#E0",
     }
 //    ShortCountry { "CZE" }
-    LocaleID { "0405" }
+    LocaleID:int { 0x0405 }
 }
diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt
index dc3dfcfe2e6..4a3416b1b04 100644
--- a/icu4c/source/data/locales/da.txt
+++ b/icu4c/source/data/locales/da.txt
@@ -52,7 +52,7 @@ da {
     Languages { 
         da { "dansk" }
     }
-    LocaleID { "06" }
+    LocaleID:int { 0x06 }
 //    LocaleString { "da" }
     MonthAbbreviations { 
         "jan",
diff --git a/icu4c/source/data/locales/da_DK.txt b/icu4c/source/data/locales/da_DK.txt
index 2cd91294a71..cc386e8d877 100644
--- a/icu4c/source/data/locales/da_DK.txt
+++ b/icu4c/source/data/locales/da_DK.txt
@@ -20,5 +20,5 @@ da_DK {
         "#E0",
     }
 //    ShortCountry { "DNK" }
-    LocaleID { "0406" }
+    LocaleID:int { 0x0406 }
 }
diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt
index e0b4f87da0e..645a45c1a37 100644
--- a/icu4c/source/data/locales/de.txt
+++ b/icu4c/source/data/locales/de.txt
@@ -459,7 +459,7 @@ de {
         // ? za { "Zhuang" }
         // same as in root?? zu { "Zulu" }
     }
-    LocaleID { "07" }
+    LocaleID:int { 0x07 }
 //    LocaleString { "de" }
     MonthAbbreviations { 
         "Jan",
@@ -489,7 +489,7 @@ de {
         "November",
         "Dezember",
     }
-    NumberElements { 
+    NumberElements {
         ",",
         ".",
         ";",
diff --git a/icu4c/source/data/locales/de_AT.txt b/icu4c/source/data/locales/de_AT.txt
index 5b2a8329e4e..222bb3ab75c 100644
--- a/icu4c/source/data/locales/de_AT.txt
+++ b/icu4c/source/data/locales/de_AT.txt
@@ -27,7 +27,7 @@ de_AT {
         "dd.MM.yy",
         "{1} {0}",
     }
-    LocaleID { "0c07" }
+    LocaleID:int { 0x0c07 }
 //    LocaleString { "de_AT" }
     MonthAbbreviations { 
         "J\u00E4n",
diff --git a/icu4c/source/data/locales/de_BE.txt b/icu4c/source/data/locales/de_BE.txt
index d049662f1fb..31c639dfe39 100644
--- a/icu4c/source/data/locales/de_BE.txt
+++ b/icu4c/source/data/locales/de_BE.txt
@@ -1,104 +1,102 @@
-//*******************************************************************************
-//*
-//*   Copyright (C) 2001-2003, International Business Machines
-//*   Corporation and others.  All Rights Reserved.
-//*   Generated from Universal Locales for Linux Project
-//*******************************************************************************
+// ***************************************************************************
+// *
+// *   Copyright (C) 2001-2002, International Business Machines
+// *   Corporation and others.  All Rights Reserved.
+// *   Generated from Universal Locales for Linux Project
+// ***************************************************************************
 
 de_BE {
-
-   Version{ "1.0" }
-    AmPmMarkers { 
-            "vorm",
-            "nachm",
-    }
+    Version{ "1.0" }
+//    AmPmMarkers { 
+//        "vorm",
+//        "nachm",
+//    }
     CurrencyElements { 
-            "Fr",
-            "BEF ",
-            ",",
+        "Fr",
+        "BEF ",
+        ",",
     }
     DateTimePatterns { 
-            "HH h mm min ss s z",
-            "HH h mm min ss s z",
-            "HH h mm min ss s z",
-            "HH h mm min ss s z",
-            "EEEE dd MMMM yyyy ",
-            "EEEE dd MMMM yyyy ",
-            "EEEE dd MMMM yyyy",
-            "EEEE dd MMMM yyyy",
-            "{1} {0}",
+        "HH 'h' mm 'min' ss 's' z",
+        "HH 'h' mm 'min' ss 's' z",
+        "HH 'h' mm 'min' ss 's' z",
+        "HH 'h' mm 'min' ss 's'",
+        "EEEE dd MMMM yyyy ",
+        "EEEE dd MMMM yyyy ",
+        "EEEE dd MMMM yyyy",
+        "dd MMMM yyyy",
+        "{1} {0}",
     }
     DayAbbreviations { 
-            "Son",
-            "Mon",
-            "Die",
-            "Mit",
-            "Don",
-            "Fre",
-            "Sam",
+        "Son",
+        "Mon",
+        "Die",
+        "Mit",
+        "Don",
+        "Fre",
+        "Sam",
     }
-    DayNames { 
-            "Sonntag",
-            "Montag",
-            "Dienstag",
-            "Mittwoch",
-            "Donnerstag",
-            "Freitag",
-            "Samstag",
-    }
-    Measurement { "Metric" }
+//    DayNames { 
+//        "Sonntag",
+//        "Montag",
+//        "Dienstag",
+//        "Mittwoch",
+//        "Donnerstag",
+//        "Freitag",
+//        "Samstag",
+//    }
+//    Measurement { "Metric" }
     MonthAbbreviations { 
-            "Jan",
-            "Feb",
-            "M\u00E4r",
-            "Apr",
-            "Mai",
-            "Jun",
-            "Jul",
-            "Aug",
-            "Sep",
-            "Okt",
-            "Nov",
-            "Dez",
-            "",
-    }
-    MonthNames { 
-            "Januar",
-            "Februar",
-            "M\u00E4rz",
-            "April",
-            "Mai",
-            "Juni",
-            "Juli",
-            "August",
-            "September",
-            "Oktober",
-            "November",
-            "Dezember",
-            "",
-    }
-    NumberElements { 
-            ",",
-            ".",
-            ";",
-            "%",
-            "0",
-            "#",
-            "-",
-            "E",
-            "\u2030",
-            "\u221E",
-            "\uFFFD",
+        "Jan",
+        "Feb",
+        "M\u00E4r",
+        "Apr",
+        "Mai",
+        "Jun",
+        "Jul",
+        "Aug",
+        "Sep",
+        "Okt",
+        "Nov",
+        "Dez",
     }
+//    MonthNames { 
+//        "Januar",
+//        "Februar",
+//        "M\u00E4rz",
+//        "April",
+//        "Mai",
+//        "Juni",
+//        "Juli",
+//        "August",
+//        "September",
+//        "Oktober",
+//        "November",
+//        "Dezember",
+//    }
+//    NumberElements {
+//        ",",
+//        ".",
+//        ";",
+//        "%",
+//        "0",
+//        "#",
+//        "-",
+//        "E",
+//        "\u2030",
+//        "\u221E",
+//        "\uFFFD",
+//    }
     NumberPatterns { 
-            "#,##0.###;-#,##0.###",
-            "#,##0.0000\u00A4;-\u00A4#,##0.0000",
-            "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "#,##0.0000\u00A4;-\u00A4#,##0.0000",
+        "#,##0%",
+        "#E0",
     }
-    PaperSize { 
-        Hieght { "297" }
-        Width { "210" }
-        Units { "mm" }
-    }
-    LocaleString{ "de_BE" }
+//    PaperSize { 
+//        Hieght { "297" }
+//        Width { "210" }
+//        Units { "mm" }
+//    }
+//    LocaleString{ "de_BE" }
 }
diff --git a/icu4c/source/data/locales/de_CH.txt b/icu4c/source/data/locales/de_CH.txt
index e7387faa87d..d3759d7d2dd 100644
--- a/icu4c/source/data/locales/de_CH.txt
+++ b/icu4c/source/data/locales/de_CH.txt
@@ -33,7 +33,7 @@ de_CH {
         "CHF",
         ".",
     }
-    LocaleID { "0807" }
+    LocaleID:int { 0x0807 }
 //    LocaleString { "de_CH" }
     NumberElements { 
         ".",
diff --git a/icu4c/source/data/locales/de_DE.txt b/icu4c/source/data/locales/de_DE.txt
index 6f3b86383ed..a3f4dbac8af 100644
--- a/icu4c/source/data/locales/de_DE.txt
+++ b/icu4c/source/data/locales/de_DE.txt
@@ -20,5 +20,5 @@ de_DE {
         "#E0",
     }
 //    ShortCountry { "DEU" }
-    LocaleID { "0407" }
+    LocaleID:int { 0x0407 }
 }
diff --git a/icu4c/source/data/locales/de_LI.txt b/icu4c/source/data/locales/de_LI.txt
index 33ffefa1b7f..51434e37d8f 100644
--- a/icu4c/source/data/locales/de_LI.txt
+++ b/icu4c/source/data/locales/de_LI.txt
@@ -1,16 +1,16 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 de_LI{
- Version{ "x0.1" }
- LocaleID{ "1407"}
- CurrencyElements{
-  "CHF",
-  "CHF",
-  "."
- }
+    Version{ "x0.1" }
+    LocaleID:int { 0x1407 }
+    CurrencyElements{
+        "CHF",
+        "CHF",
+        "."
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/de_LU.txt b/icu4c/source/data/locales/de_LU.txt
index 8ad6850ff21..473c71ed7c0 100644
--- a/icu4c/source/data/locales/de_LU.txt
+++ b/icu4c/source/data/locales/de_LU.txt
@@ -20,7 +20,7 @@ de_LU {
         "#E0",
     }
 //    ShortCountry { "LUX" }
-    LocaleID { "1007" }
+    LocaleID:int { 0x1007 }
     DateTimeElements {
         "2",
         "1",
diff --git a/icu4c/source/data/locales/de__PHONEBOOK.txt b/icu4c/source/data/locales/de__PHONEBOOK.txt
index 284423f260e..e16e2ba5cd5 100644
--- a/icu4c/source/data/locales/de__PHONEBOOK.txt
+++ b/icu4c/source/data/locales/de__PHONEBOOK.txt
@@ -1,9 +1,9 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 1997-2001, International Business Machines
+// *   Copyright (C) 1997-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 de__PHONEBOOK {
     Version { "1.0" }
@@ -14,5 +14,5 @@ de__PHONEBOOK {
         "&ue <<< \u00FC &UE <<< \u00DC" }
     }
     // This LCID may be de_DE_PHONEBOOK, but it's unclear in the Microsoft documentation.
-    LocaleID { "10407" }
+    LocaleID:int { 0x10407 }
 }
diff --git a/icu4c/source/data/locales/div.txt b/icu4c/source/data/locales/div.txt
index 3d3c436337d..9a2ae4a7f03 100644
--- a/icu4c/source/data/locales/div.txt
+++ b/icu4c/source/data/locales/div.txt
@@ -1,98 +1,97 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 div {
- LocaleID{ "046"}
- Version{ "x0.1" }
- AmPmMarkers{
-  "\u0789\u0786",
-  "\u0789\u078A"
- }
- ShortLanguage{
-  "DIV"
- }
- DayNames{
-  "\u0787\u07A7\u078B\u07A9\u0787\u07B0\u078C\u07A6\u078B\u07AA\u0788\u07A6\u0790\u07B0",
-  "\u0780\u07AF\u0789\u07A6\u078B\u07AA\u0788\u07A6\u0790\u07B0",
-  "\u0787\u07A6\u0782\u07B0\u078E\u07A7\u0783\u07A6\u078B\u07AA\u0788\u07A6\u0790\u07B0",
-  "\u0784\u07AA\u078B\u07A6\u078B\u07AA\u0788\u07A6\u0790\u07B0",
-  "\u0784\u07AA\u0783\u07A7\u0790\u07B0\u078A\u07A6\u078C\u07A8\u078B\u07AA\u0788\u07A6\u0790\u07B0",
-  "\u0780\u07AA\u0786\u07AA\u0783\u07AA\u078B\u07AA\u0788\u07A6\u0790\u07B0",
-  "\u0780\u07AE\u0782\u07A8\u0780\u07A8\u0783\u07AA\u078B\u07AA\u0788\u07A6\u0790\u07B0"
- }
-
- DayAbbreviations{
-  "\u0787\u07A7\u078B\u07A9\u0787\u07B0\u078C\u07A6",
-  "\u0780\u07AF\u0789\u07A6",
-  "\u0787\u07A6\u0782\u07B0\u078E\u07A7\u0783\u07A6",
-  "\u0784\u07AA\u078B\u07A6",
-  "\u0784\u07AA\u0783\u07A7\u0790\u07B0\u078A\u07A6\u078C\u07A8",
-  "\u0780\u07AA\u0786\u07AA\u0783\u07AA",
-  "\u0780\u07AE\u0782\u07A8\u0780\u07A8\u0783\u07AA"
- }
-
- MonthNames{
-  "\u0796\u07AC\u0782\u07AA\u0787\u07A6\u0783\u07A9",
-  "\u078A\u07AC\u0784\u07AA\u0783\u07AA\u0787\u07A6\u0783\u07A9",
-  "\u0789\u07A7\u0797\u07B0",
-  "\u0787\u07AC\u0795\u07B0\u0783\u07A8\u078D\u07B0",
-  "\u0789\u07AD\u0787\u07A8",
-  "\u0796\u07AB\u0782\u07B0",
-  "\u0796\u07AB\u078D\u07A7\u0787\u07A8",
-  "\u0787\u07AF\u078E\u07A6\u0790\u07B0\u0793\u07B0",
-  "\u0790\u07AC\u0795\u07B0\u0793\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
-  "\u0787\u07AE\u0786\u07B0\u0793\u07AF\u0784\u07A6\u0783\u07AA",
-  "\u0782\u07AE\u0788\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
-  "\u0791\u07A8\u0790\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
-  ""
- }
-
- MonthAbbreviations{
-  "\u0796\u07AC\u0782\u07AA\u0787\u07A6\u0783\u07A9",
-  "\u078A\u07AC\u0784\u07AA\u0783\u07AA\u0787\u07A6\u0783\u07A9",
-  "\u0789\u07A7\u0797\u07B0",
-  "\u0787\u07AC\u0795\u07B0\u0783\u07A8\u078D\u07B0",
-  "\u0789\u07AD\u0787\u07A8",
-  "\u0796\u07AB\u0782\u07B0",
-  "\u0796\u07AB\u078D\u07A7\u0787\u07A8",
-  "\u0787\u07AF\u078E\u07A6\u0790\u07B0\u0793\u07B0",
-  "\u0790\u07AC\u0795\u07B0\u0793\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
-  "\u0787\u07AE\u0786\u07B0\u0793\u07AF\u0784\u07A6\u0783\u07AA",
-  "\u0782\u07AE\u0788\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
-  "\u0791\u07A8\u0790\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
-  ""
- }
-
- NumberElements{
-  ".",
-  ",",
-  "\u060C",
-  "%",
-  "\u060C",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- NumberPatterns {
-    "#,##,##0.###;-#,##,##0.###",
-    "\u00A4 #,##,##0.00;-\u00A4 #,##,##0.00",
-    "#,##,##0%"
- }
- LocaleScript{
-  "THAA"
- }
-
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.1" }
+    LocaleID:int { 0x046 }
+    AmPmMarkers{
+        "\u0789\u0786",
+        "\u0789\u078A"
+    }
+//    ShortLanguage{
+//        "DIV"
+//    }
+    DayNames{
+        "\u0787\u07A7\u078B\u07A9\u0787\u07B0\u078C\u07A6\u078B\u07AA\u0788\u07A6\u0790\u07B0",
+        "\u0780\u07AF\u0789\u07A6\u078B\u07AA\u0788\u07A6\u0790\u07B0",
+        "\u0787\u07A6\u0782\u07B0\u078E\u07A7\u0783\u07A6\u078B\u07AA\u0788\u07A6\u0790\u07B0",
+        "\u0784\u07AA\u078B\u07A6\u078B\u07AA\u0788\u07A6\u0790\u07B0",
+        "\u0784\u07AA\u0783\u07A7\u0790\u07B0\u078A\u07A6\u078C\u07A8\u078B\u07AA\u0788\u07A6\u0790\u07B0",
+        "\u0780\u07AA\u0786\u07AA\u0783\u07AA\u078B\u07AA\u0788\u07A6\u0790\u07B0",
+        "\u0780\u07AE\u0782\u07A8\u0780\u07A8\u0783\u07AA\u078B\u07AA\u0788\u07A6\u0790\u07B0"
+    }
+
+    DayAbbreviations{
+        "\u0787\u07A7\u078B\u07A9\u0787\u07B0\u078C\u07A6",
+        "\u0780\u07AF\u0789\u07A6",
+        "\u0787\u07A6\u0782\u07B0\u078E\u07A7\u0783\u07A6",
+        "\u0784\u07AA\u078B\u07A6",
+        "\u0784\u07AA\u0783\u07A7\u0790\u07B0\u078A\u07A6\u078C\u07A8",
+        "\u0780\u07AA\u0786\u07AA\u0783\u07AA",
+        "\u0780\u07AE\u0782\u07A8\u0780\u07A8\u0783\u07AA"
+    }
+
+    MonthNames{
+        "\u0796\u07AC\u0782\u07AA\u0787\u07A6\u0783\u07A9",
+        "\u078A\u07AC\u0784\u07AA\u0783\u07AA\u0787\u07A6\u0783\u07A9",
+        "\u0789\u07A7\u0797\u07B0",
+        "\u0787\u07AC\u0795\u07B0\u0783\u07A8\u078D\u07B0",
+        "\u0789\u07AD\u0787\u07A8",
+        "\u0796\u07AB\u0782\u07B0",
+        "\u0796\u07AB\u078D\u07A7\u0787\u07A8",
+        "\u0787\u07AF\u078E\u07A6\u0790\u07B0\u0793\u07B0",
+        "\u0790\u07AC\u0795\u07B0\u0793\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
+        "\u0787\u07AE\u0786\u07B0\u0793\u07AF\u0784\u07A6\u0783\u07AA",
+        "\u0782\u07AE\u0788\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
+        "\u0791\u07A8\u0790\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
+    }
+
+    MonthAbbreviations{
+        "\u0796\u07AC\u0782\u07AA\u0787\u07A6\u0783\u07A9",
+        "\u078A\u07AC\u0784\u07AA\u0783\u07AA\u0787\u07A6\u0783\u07A9",
+        "\u0789\u07A7\u0797\u07B0",
+        "\u0787\u07AC\u0795\u07B0\u0783\u07A8\u078D\u07B0",
+        "\u0789\u07AD\u0787\u07A8",
+        "\u0796\u07AB\u0782\u07B0",
+        "\u0796\u07AB\u078D\u07A7\u0787\u07A8",
+        "\u0787\u07AF\u078E\u07A6\u0790\u07B0\u0793\u07B0",
+        "\u0790\u07AC\u0795\u07B0\u0793\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
+        "\u0787\u07AE\u0786\u07B0\u0793\u07AF\u0784\u07A6\u0783\u07AA",
+        "\u0782\u07AE\u0788\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
+        "\u0791\u07A8\u0790\u07AC\u0789\u07B0\u0784\u07A6\u0783\u07AA",
+    }
+
+    NumberElements{
+        ".",
+        ",",
+        "\u060C",
+        "%",
+        "\u060C",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    NumberPatterns {
+        "#,##,##0.###;-#,##,##0.###",
+        "\u00A4 #,##,##0.00;-\u00A4 #,##,##0.00",
+        "#,##,##0%",
+        "#E0",
+    }
+    LocaleScript{
+        "THAA"
+    }
+
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+             "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/div_MV.txt b/icu4c/source/data/locales/div_MV.txt
index 7b5b7ed4e0a..211bb899b1f 100644
--- a/icu4c/source/data/locales/div_MV.txt
+++ b/icu4c/source/data/locales/div_MV.txt
@@ -1,18 +1,18 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 div_MV{
     Version { "x0.1" }
-    LocaleID { "0465" }
-    ShortCountry { MDV }
+    LocaleID:int { 0x0465 }
+//    ShortCountry { MDV }
     CurrencyElements{
-  	"\u0783.",
-  	"MVR",
-  	"."
+  	    "\u0783.",
+  	    "MVR",
+  	    "."
     }
     DateTimePatterns {
         "hh:mm:ss a z",
diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt
index a6efac4658d..95131f2c921 100644
--- a/icu4c/source/data/locales/el.txt
+++ b/icu4c/source/data/locales/el.txt
@@ -128,7 +128,7 @@ el {
         sr { "\u03a3\u03b5\u03c1\u03b2\u03b9\u03ba\u03ac" }
         sv { "\u03a3\u03bf\u03c5\u03b7\u03b4\u03b9\u03ba\u03ac" }
     }
-    LocaleID { "08" }
+    LocaleID:int { 0x08 }
 //    LocaleString { "el" }
     MonthAbbreviations { 
         "\u0399\u03B1\u03BD",
diff --git a/icu4c/source/data/locales/el_GR.txt b/icu4c/source/data/locales/el_GR.txt
index 8be74d8e705..fc03acf5762 100644
--- a/icu4c/source/data/locales/el_GR.txt
+++ b/icu4c/source/data/locales/el_GR.txt
@@ -21,5 +21,5 @@ el_GR {
         "#E0",
     }
 //    ShortCountry { "GRC" }
-    LocaleID { "0408" }
+    LocaleID:int { 0x0408 }
 }
diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt
index 6815ac9902b..a3a0b057a4b 100644
--- a/icu4c/source/data/locales/en.txt
+++ b/icu4c/source/data/locales/en.txt
@@ -252,7 +252,7 @@ en {
             "Shanghai",
         }
     }
-    LocaleID { "09" }
+    LocaleID:int { 0x09 }
 //    LocaleScript{ 
 //        "Latn",  // ISO 15924 Name 
 //    }
diff --git a/icu4c/source/data/locales/en_AS.txt b/icu4c/source/data/locales/en_AS.txt
index c1768b6a078..dc2acb44467 100644
--- a/icu4c/source/data/locales/en_AS.txt
+++ b/icu4c/source/data/locales/en_AS.txt
@@ -1,22 +1,24 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 1997-2001, International Business Machines
+// *   Copyright (C) 1997-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 en_AS {
+    Version { "x0.1" }
     CurrencyElements { 
-            "$",
-            "USD",
-            ".",
+        "$",
+        "USD",
+        ".",
     }
-    LocaleString { "en_AS" }
+//    LocaleString { "en_AS" }
     NumberPatterns { 
-            "#,##0.###;-#,##0.###",
-            "\u00A4#,##0.00;(\u00A4#,##0.00)",
-            "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "\u00A4#,##0.00;(\u00A4#,##0.00)",
+        "#,##0%",
+        "#E0",
     }
-    ShortCountry { "ASM" }
-    LocaleID { "0409" }
+//    ShortCountry { "ASM" }
+    LocaleID:int { 0x0409 }
 }
diff --git a/icu4c/source/data/locales/en_AU.txt b/icu4c/source/data/locales/en_AU.txt
index 35ce7ba014d..7229c54e4b3 100644
--- a/icu4c/source/data/locales/en_AU.txt
+++ b/icu4c/source/data/locales/en_AU.txt
@@ -36,7 +36,7 @@ en_AU {
 //    Languages { 
 //        en { "English" }
 //    }
-    LocaleID { "0c09" }
+    LocaleID:int { 0x0c09 }
 //    LocaleString { "en_AU" }
 //    ShortCountry { "AUS" }
 }
diff --git a/icu4c/source/data/locales/en_BZ.txt b/icu4c/source/data/locales/en_BZ.txt
index eef3047cf82..feab02b6e95 100644
--- a/icu4c/source/data/locales/en_BZ.txt
+++ b/icu4c/source/data/locales/en_BZ.txt
@@ -1,34 +1,33 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 1997-2000, International Business Machines
+// *   Copyright (C) 1997-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 en_BZ{
- Version{ "x0.1" }
- LocaleID{ "2809"}
+    Version{ "x0.1" }
+    LocaleID:int { 0x2809 }
 
- CurrencyElements{
-  "BZ$",
-  "BZD",
-  "."
- }
-
- DateTimeElements { 
-      "2",
-      "1",
- }
- DateTimePatterns { 
-    "HH:mm:ss 'o''clock' z",
-    "HH:mm:ss z",
-    "HH:mm:ss",
-    "HH:mm",
-    "dd MMMM yyyy",
-    "dd MMMM yyyy",
-    "dd-MMM-yy",
-    "dd/MM/yy",
-    "{1} {0}",
- }
+    CurrencyElements{
+        "BZ$",
+        "BZD",
+        "."
+    }
 
+    DateTimeElements { 
+        "2",
+        "1",
+    }
+    DateTimePatterns { 
+        "HH:mm:ss 'o''clock' z",
+        "HH:mm:ss z",
+        "HH:mm:ss",
+        "HH:mm",
+        "dd MMMM yyyy",
+        "dd MMMM yyyy",
+        "dd-MMM-yy",
+        "dd/MM/yy",
+        "{1} {0}",
+    }
 }
diff --git a/icu4c/source/data/locales/en_CA.txt b/icu4c/source/data/locales/en_CA.txt
index 923e46d19e8..2e75b469f82 100644
--- a/icu4c/source/data/locales/en_CA.txt
+++ b/icu4c/source/data/locales/en_CA.txt
@@ -36,7 +36,7 @@ en_CA {
 //    Languages { 
 //        en { "English" }
 //    }
-    LocaleID { "1009" }
+    LocaleID:int { 0x1009 }
 //    LocaleString { "en_CA" }
 //    ShortCountry { "CAN" }
 
diff --git a/icu4c/source/data/locales/en_GB.txt b/icu4c/source/data/locales/en_GB.txt
index 7df4f2abe6a..374241ae225 100644
--- a/icu4c/source/data/locales/en_GB.txt
+++ b/icu4c/source/data/locales/en_GB.txt
@@ -40,7 +40,7 @@ en_GB {
 //    Languages { 
 //        en { "English" }
 //    }
-    LocaleID { "0809" }
+    LocaleID:int { 0x0809 }
 //    LocaleString { "en_GB" }
 //    ShortCountry { "GBR" }
     zoneStrings { 
diff --git a/icu4c/source/data/locales/en_GU.txt b/icu4c/source/data/locales/en_GU.txt
index cdaaa633ec3..953f07a0d73 100644
--- a/icu4c/source/data/locales/en_GU.txt
+++ b/icu4c/source/data/locales/en_GU.txt
@@ -1,22 +1,24 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 1997-2001, International Business Machines
+// *   Copyright (C) 1997-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 en_GU {
+    Version{ "x0.1" }
     CurrencyElements { 
-            "$",
-            "USD",
-            ".",
+        "$",
+        "USD",
+        ".",
     }
-    LocaleString { "en_GU" }
+//    LocaleString { "en_GU" }
     NumberPatterns { 
-            "#,##0.###;-#,##0.###",
-            "\u00A4#,##0.00;(\u00A4#,##0.00)",
-            "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "\u00A4#,##0.00;(\u00A4#,##0.00)",
+        "#,##0%",
+        "#E0",
     }
-    ShortCountry { "GUM" }
-    LocaleID { "0409" }
+//    ShortCountry { "GUM" }
+    LocaleID:int { 0x0409 }
 }
diff --git a/icu4c/source/data/locales/en_IE.txt b/icu4c/source/data/locales/en_IE.txt
index a98c2ef4f8a..0295c9b0c67 100644
--- a/icu4c/source/data/locales/en_IE.txt
+++ b/icu4c/source/data/locales/en_IE.txt
@@ -40,7 +40,7 @@ en_IE {
 //    Languages { 
 //        en { "English" }
 //    }
-    LocaleID { "1809" }
+    LocaleID:int { 0x1809 }
 //    LocaleString { "en_IE" }
 //    ShortCountry { "IRL" }
     zoneStrings { 
diff --git a/icu4c/source/data/locales/en_JM.txt b/icu4c/source/data/locales/en_JM.txt
index 6749cfb3802..fc86adf7af0 100644
--- a/icu4c/source/data/locales/en_JM.txt
+++ b/icu4c/source/data/locales/en_JM.txt
@@ -1,16 +1,16 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
  
 en_JM{
- Version{ "x0.1" }
- LocaleID{ "2009"}
- CurrencyElements{
-  "J$",
-  "JMD",
-  "."
- }
+    Version{ "x0.1" }
+    LocaleID:int { 0x2009 }
+    CurrencyElements{
+        "J$",
+        "JMD",
+        "."
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/en_MH.txt b/icu4c/source/data/locales/en_MH.txt
index a79df3011a5..b01ed61c23f 100644
--- a/icu4c/source/data/locales/en_MH.txt
+++ b/icu4c/source/data/locales/en_MH.txt
@@ -1,22 +1,24 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 1997-2001, International Business Machines
+// *   Copyright (C) 1997-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 en_MH {
+    Version{ "x0.1" }
     CurrencyElements { 
-            "$",
-            "USD",
-            ".",
+        "$",
+        "USD",
+        ".",
     }
-    LocaleString { "en_MH" }
+//    LocaleString { "en_MH" }
     NumberPatterns { 
-            "#,##0.###;-#,##0.###",
-            "\u00A4#,##0.00;(\u00A4#,##0.00)",
-            "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "\u00A4#,##0.00;(\u00A4#,##0.00)",
+        "#,##0%",
+        "#E0",
     }
-    ShortCountry { "MHL" }
-    LocaleID { "0409" }
+//    ShortCountry { "MHL" }
+    LocaleID:int { 0x0409 }
 }
diff --git a/icu4c/source/data/locales/en_MP.txt b/icu4c/source/data/locales/en_MP.txt
index a49d832bac7..a8c07f6b961 100644
--- a/icu4c/source/data/locales/en_MP.txt
+++ b/icu4c/source/data/locales/en_MP.txt
@@ -1,22 +1,24 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 1997-2001, International Business Machines
+// *   Copyright (C) 1997-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 en_MP {
+    Version{ "x0.1" }
     CurrencyElements { 
-            "$",
-            "USD",
-            ".",
+        "$",
+        "USD",
+        ".",
     }
-    LocaleString { "en_MP" }
+//    LocaleString { "en_MP" }
     NumberPatterns { 
-            "#,##0.###;-#,##0.###",
-            "\u00A4#,##0.00;(\u00A4#,##0.00)",
-            "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "\u00A4#,##0.00;(\u00A4#,##0.00)",
+        "#,##0%",
+        "#E0",
     }
-    ShortCountry { "MNP" }
-    LocaleID { "0409" }
+//    ShortCountry { "MNP" }
+    LocaleID:int { 0x0409 }
 }
diff --git a/icu4c/source/data/locales/en_NZ.txt b/icu4c/source/data/locales/en_NZ.txt
index 05c68e42f26..7a665026818 100644
--- a/icu4c/source/data/locales/en_NZ.txt
+++ b/icu4c/source/data/locales/en_NZ.txt
@@ -36,7 +36,7 @@ en_NZ {
 //    Languages { 
 //        en { "English" }
 //    }
-    LocaleID { "1409" }
+    LocaleID:int { 0x1409 }
 //    LocaleString { "en_NZ" }
 //    ShortCountry { "NZL" }
 }
diff --git a/icu4c/source/data/locales/en_PH.txt b/icu4c/source/data/locales/en_PH.txt
index e9fafbd5e01..e742b58d219 100644
--- a/icu4c/source/data/locales/en_PH.txt
+++ b/icu4c/source/data/locales/en_PH.txt
@@ -47,6 +47,6 @@ en_PH {
         "#,##0%",
         "#E0",
     }
-    LocaleID { "3409" }
+    LocaleID:int { 0x3409 }
 
 }
diff --git a/icu4c/source/data/locales/en_TT.txt b/icu4c/source/data/locales/en_TT.txt
index 7914e60f5b8..f82a72c8c26 100644
--- a/icu4c/source/data/locales/en_TT.txt
+++ b/icu4c/source/data/locales/en_TT.txt
@@ -1,16 +1,16 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
  
 en_TT{
- Version{ "x0.1" }
- LocaleID{ "2C09"}
- CurrencyElements{
-  "TT$",
-  "TTD",
-  "."
- }
+    Version{ "x0.1" }
+    LocaleID:int { 0x2C09 }
+    CurrencyElements{
+        "TT$",
+        "TTD",
+        "."
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/en_UM.txt b/icu4c/source/data/locales/en_UM.txt
index 0dd468045a0..f262cb8ff8f 100644
--- a/icu4c/source/data/locales/en_UM.txt
+++ b/icu4c/source/data/locales/en_UM.txt
@@ -1,22 +1,24 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 1997-2001, International Business Machines
+// *   Copyright (C) 1997-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 en_UM {
+    Version{ "x0.1" }
     CurrencyElements { 
-            "$",
-            "USD",
-            ".",
+        "$",
+        "USD",
+        ".",
     }
-    LocaleString { "en_UM" }
+//    LocaleString { "en_UM" }
     NumberPatterns { 
-            "#,##0.###;-#,##0.###",
-            "\u00A4#,##0.00;(\u00A4#,##0.00)",
-            "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "\u00A4#,##0.00;(\u00A4#,##0.00)",
+        "#,##0%",
+        "#E0",
     }
-    ShortCountry { "UMI" }
-    LocaleID { "0409" }
+//    ShortCountry { "UMI" }
+    LocaleID:int { 0x0409 }
 }
diff --git a/icu4c/source/data/locales/en_US.txt b/icu4c/source/data/locales/en_US.txt
index 77c30f65ea6..c234c81928a 100644
--- a/icu4c/source/data/locales/en_US.txt
+++ b/icu4c/source/data/locales/en_US.txt
@@ -20,5 +20,5 @@ en_US {
         "#E0",
     }
 //    ShortCountry { "USA" }
-    LocaleID { "0409" }
+    LocaleID:int { 0x0409 }
 }
diff --git a/icu4c/source/data/locales/en_US_POSIX.txt b/icu4c/source/data/locales/en_US_POSIX.txt
index 63c91be4352..e7dbf441fa3 100644
--- a/icu4c/source/data/locales/en_US_POSIX.txt
+++ b/icu4c/source/data/locales/en_US_POSIX.txt
@@ -45,5 +45,5 @@ en_US_POSIX {
         "\uFFFD",
     }
 //    LocaleString { "en_US_POSIX" }
-    LocaleID { "7F" }
+    LocaleID:int { 0x7F }
 }
diff --git a/icu4c/source/data/locales/en_VI.txt b/icu4c/source/data/locales/en_VI.txt
index 0ef8dc546a6..e88b54bc236 100644
--- a/icu4c/source/data/locales/en_VI.txt
+++ b/icu4c/source/data/locales/en_VI.txt
@@ -20,5 +20,5 @@ en_VI {
         "#E0",
     }
 //    ShortCountry { "VIR" }
-    LocaleID { "2409" }
+    LocaleID:int { 0x2409 }
 }
diff --git a/icu4c/source/data/locales/en_ZA.txt b/icu4c/source/data/locales/en_ZA.txt
index b26119abb52..9931e1b76c1 100644
--- a/icu4c/source/data/locales/en_ZA.txt
+++ b/icu4c/source/data/locales/en_ZA.txt
@@ -35,7 +35,7 @@ en_ZA {
 //    Languages { 
 //        en { "English" }
 //    }
-    LocaleID { "1c09" }
+    LocaleID:int { 0x1c09 }
 //    LocaleString { "en_ZA" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
diff --git a/icu4c/source/data/locales/en_ZW.txt b/icu4c/source/data/locales/en_ZW.txt
index 2ad7dbb36f3..5f35f8620f0 100644
--- a/icu4c/source/data/locales/en_ZW.txt
+++ b/icu4c/source/data/locales/en_ZW.txt
@@ -30,5 +30,5 @@ en_ZW {
         "#,##0%",
         "#E0",
     }
-    LocaleID{ "3009"}
+    LocaleID:int { 0x3009 }
 }
diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt
index 7bc68104ef6..047dc4c686d 100644
--- a/icu4c/source/data/locales/es.txt
+++ b/icu4c/source/data/locales/es.txt
@@ -191,7 +191,7 @@ es {
         zh { "chino" }
         zu { "zul\u00FA" }
     }
-    LocaleID { "0a" }
+    LocaleID:int { 0x0a }
 //    LocaleString { "es" }
     MonthAbbreviations { 
         "ene",
diff --git a/icu4c/source/data/locales/es_AR.txt b/icu4c/source/data/locales/es_AR.txt
index 6b8c20a6d86..d56533462fa 100644
--- a/icu4c/source/data/locales/es_AR.txt
+++ b/icu4c/source/data/locales/es_AR.txt
@@ -36,7 +36,7 @@ es_AR {
         "\u221E",
         "\uFFFD",
     }
-    LocaleID { "2c0a" }
+    LocaleID:int { 0x2c0a }
 //    LocaleString { "es_AR" }
 //    ShortCountry { "ARG" }
 }
diff --git a/icu4c/source/data/locales/es_BO.txt b/icu4c/source/data/locales/es_BO.txt
index cb048026453..1af210a37fc 100644
--- a/icu4c/source/data/locales/es_BO.txt
+++ b/icu4c/source/data/locales/es_BO.txt
@@ -23,7 +23,7 @@ es_BO {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "400a" }
+    LocaleID:int { 0x400a }
 //    LocaleString { "es_BO" }
     NumberElements { 
         ",",
diff --git a/icu4c/source/data/locales/es_CL.txt b/icu4c/source/data/locales/es_CL.txt
index 6e87f496d23..505d6ea4ab9 100644
--- a/icu4c/source/data/locales/es_CL.txt
+++ b/icu4c/source/data/locales/es_CL.txt
@@ -23,7 +23,7 @@ es_CL {
         "dd-MM-yy",
         "{1} {0}",
     }
-    LocaleID { "340a" }
+    LocaleID:int { 0x340a }
 //    LocaleString { "es_CL" }
     NumberElements {
         ",",
diff --git a/icu4c/source/data/locales/es_CO.txt b/icu4c/source/data/locales/es_CO.txt
index f668b255c66..17daf026cda 100644
--- a/icu4c/source/data/locales/es_CO.txt
+++ b/icu4c/source/data/locales/es_CO.txt
@@ -23,7 +23,7 @@ es_CO {
         "d/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "240a" }
+    LocaleID:int { 0x240a }
 //    LocaleString { "es_CO" }
     NumberElements { 
         ",",
diff --git a/icu4c/source/data/locales/es_CR.txt b/icu4c/source/data/locales/es_CR.txt
index 2447bd71879..1d078aba19e 100644
--- a/icu4c/source/data/locales/es_CR.txt
+++ b/icu4c/source/data/locales/es_CR.txt
@@ -23,7 +23,7 @@ es_CR {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "140a" }
+    LocaleID:int { 0x140a }
 //    LocaleString { "es_CR" }
     NumberElements { 
         ",",
diff --git a/icu4c/source/data/locales/es_DO.txt b/icu4c/source/data/locales/es_DO.txt
index c86cc31f4df..cfd9a517b73 100644
--- a/icu4c/source/data/locales/es_DO.txt
+++ b/icu4c/source/data/locales/es_DO.txt
@@ -23,7 +23,7 @@ es_DO {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "1c0a" }
+    LocaleID:int { 0x1c0a }
 //    LocaleString { "es_DO" }
 //    NumberElements {
 //        ".",
diff --git a/icu4c/source/data/locales/es_EC.txt b/icu4c/source/data/locales/es_EC.txt
index c57f4a785c1..35126ad2775 100644
--- a/icu4c/source/data/locales/es_EC.txt
+++ b/icu4c/source/data/locales/es_EC.txt
@@ -23,7 +23,7 @@ es_EC {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "300a" }
+    LocaleID:int { 0x300a }
 //    LocaleString { "es_EC" }
     NumberElements { 
         ",",
diff --git a/icu4c/source/data/locales/es_ES.txt b/icu4c/source/data/locales/es_ES.txt
index b20743abb38..d0134339603 100644
--- a/icu4c/source/data/locales/es_ES.txt
+++ b/icu4c/source/data/locales/es_ES.txt
@@ -33,5 +33,5 @@ es_ES {
         "#E0",
     }
 //    ShortCountry { "ESP" }
-    LocaleID { "0c0a" }
+    LocaleID:int { 0x0c0a }
 }
diff --git a/icu4c/source/data/locales/es_GT.txt b/icu4c/source/data/locales/es_GT.txt
index 3378ab16853..58eab96b3e5 100644
--- a/icu4c/source/data/locales/es_GT.txt
+++ b/icu4c/source/data/locales/es_GT.txt
@@ -23,7 +23,7 @@ es_GT {
         "d/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "100a" }
+    LocaleID:int { 0x100a }
 //    LocaleString { "es_GT" }
 //    NumberElements { 
 //        ".",
diff --git a/icu4c/source/data/locales/es_HN.txt b/icu4c/source/data/locales/es_HN.txt
index 1cfeeb48e58..d8e4b24ed35 100644
--- a/icu4c/source/data/locales/es_HN.txt
+++ b/icu4c/source/data/locales/es_HN.txt
@@ -23,7 +23,7 @@ es_HN {
         "MM/dd/yy",
         "{1} {0}",
     }
-    LocaleID { "480a" }
+    LocaleID:int { 0x480a }
 //    LocaleString { "es_HN" }
 //    NumberElements {
 //        ".",
diff --git a/icu4c/source/data/locales/es_MX.txt b/icu4c/source/data/locales/es_MX.txt
index cf1756cd1f7..16d93aa7acb 100644
--- a/icu4c/source/data/locales/es_MX.txt
+++ b/icu4c/source/data/locales/es_MX.txt
@@ -23,7 +23,7 @@ es_MX {
         "d/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "080a" }
+    LocaleID:int { 0x080a }
 //    LocaleString { "es_MX" }
 //    NumberElements { 
 //        ".",
diff --git a/icu4c/source/data/locales/es_NI.txt b/icu4c/source/data/locales/es_NI.txt
index 93152ed88e0..c1bc9d86354 100644
--- a/icu4c/source/data/locales/es_NI.txt
+++ b/icu4c/source/data/locales/es_NI.txt
@@ -23,7 +23,7 @@ es_NI {
         "MM/dd/yy",
         "{1} {0}",
     }
-    LocaleID { "4c0a" }
+    LocaleID:int { 0x4c0a }
 //    LocaleString { "es_NI" }
 //    NumberElements {
 //        ".",
diff --git a/icu4c/source/data/locales/es_PA.txt b/icu4c/source/data/locales/es_PA.txt
index 13e1b57e412..0fa2be0aee7 100644
--- a/icu4c/source/data/locales/es_PA.txt
+++ b/icu4c/source/data/locales/es_PA.txt
@@ -23,7 +23,7 @@ es_PA {
         "MM/dd/yy",
         "{1} {0}",
     }
-    LocaleID { "180a" }
+    LocaleID:int { 0x180a }
 //    LocaleString { "es_PA" }
 //    NumberElements { 
 //        ".",
diff --git a/icu4c/source/data/locales/es_PE.txt b/icu4c/source/data/locales/es_PE.txt
index b0b769ecf3a..d2961a3a29e 100644
--- a/icu4c/source/data/locales/es_PE.txt
+++ b/icu4c/source/data/locales/es_PE.txt
@@ -23,7 +23,7 @@ es_PE {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "280a" }
+    LocaleID:int { 0x280a }
 //    LocaleString { "es_PE" }
 //    NumberElements { 
 //        ".",
diff --git a/icu4c/source/data/locales/es_PR.txt b/icu4c/source/data/locales/es_PR.txt
index c5a96611e71..20a430a8de0 100644
--- a/icu4c/source/data/locales/es_PR.txt
+++ b/icu4c/source/data/locales/es_PR.txt
@@ -23,7 +23,7 @@ es_PR {
         "MM/dd/yy",
         "{1} {0}",
     }
-    LocaleID { "500a" }
+    LocaleID:int { 0x500a }
 //    LocaleString { "es_PR" }
 //    NumberElements { 
 //        ".",
diff --git a/icu4c/source/data/locales/es_PY.txt b/icu4c/source/data/locales/es_PY.txt
index f9a79af967c..c056304bbe8 100644
--- a/icu4c/source/data/locales/es_PY.txt
+++ b/icu4c/source/data/locales/es_PY.txt
@@ -42,7 +42,7 @@ es_PY {
         "#,##0%",
         "#E0",
     }
-    LocaleID { "3c0a" }
+    LocaleID:int { 0x3c0a }
 //    LocaleString { "es_PY" }
 //    ShortCountry { "PRY" }
 }
diff --git a/icu4c/source/data/locales/es_SV.txt b/icu4c/source/data/locales/es_SV.txt
index 648d20c83c7..cff9dd42c76 100644
--- a/icu4c/source/data/locales/es_SV.txt
+++ b/icu4c/source/data/locales/es_SV.txt
@@ -38,5 +38,5 @@ es_SV {
 //        "\uFFFD",
 //    }
 //    ShortCountry { "SLV" }
-    LocaleID {"440a"}
+    LocaleID:int { 0x440a }
 }
diff --git a/icu4c/source/data/locales/es_UY.txt b/icu4c/source/data/locales/es_UY.txt
index 289d5c20229..f89ef35cb3a 100644
--- a/icu4c/source/data/locales/es_UY.txt
+++ b/icu4c/source/data/locales/es_UY.txt
@@ -23,7 +23,7 @@ es_UY {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "380a" }
+    LocaleID:int { 0x380a }
 //    LocaleString { "es_UY" }
     NumberElements {
         ",",
diff --git a/icu4c/source/data/locales/es_VE.txt b/icu4c/source/data/locales/es_VE.txt
index d80354ac702..2adf9f60d03 100644
--- a/icu4c/source/data/locales/es_VE.txt
+++ b/icu4c/source/data/locales/es_VE.txt
@@ -23,7 +23,7 @@ es_VE {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "200a" }
+    LocaleID:int { 0x200a }
 //    LocaleString { "es_VE" }
     NumberElements {
         ",",
diff --git a/icu4c/source/data/locales/es__TRADITIONAL.txt b/icu4c/source/data/locales/es__TRADITIONAL.txt
index e93e8587f85..4134c3281fb 100644
--- a/icu4c/source/data/locales/es__TRADITIONAL.txt
+++ b/icu4c/source/data/locales/es__TRADITIONAL.txt
@@ -14,5 +14,5 @@ es__TRADITIONAL {
             "&l < ll <<< Ll <<< LL"
         }
     }
-    LocaleID { "040a" }
+    LocaleID:int { 0x040a }
 }
diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt
index e6dcedb6553..80a8c8a992b 100644
--- a/icu4c/source/data/locales/et.txt
+++ b/icu4c/source/data/locales/et.txt
@@ -53,7 +53,7 @@ et {
     Languages { 
         et { "Eesti" }
     }
-    LocaleID { "25" }
+    LocaleID:int { 0x25 }
 //    LocaleString { "et" }
     MonthAbbreviations { 
         "jaan",
diff --git a/icu4c/source/data/locales/et_EE.txt b/icu4c/source/data/locales/et_EE.txt
index 6847a4f0098..279f2cfe4d8 100644
--- a/icu4c/source/data/locales/et_EE.txt
+++ b/icu4c/source/data/locales/et_EE.txt
@@ -20,5 +20,5 @@ et_EE {
         "#E0",
     }
 //    ShortCountry { "EST" }
-    LocaleID { "0425" }
+    LocaleID:int { 0x0425 }
 }
diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt
index 9a1488f9dfa..1febdbfd049 100644
--- a/icu4c/source/data/locales/eu.txt
+++ b/icu4c/source/data/locales/eu.txt
@@ -66,7 +66,7 @@ eu {
         "\u221e",
         "\ufffd",
     }
-    LocaleID{ "2D"}
+    LocaleID:int { 0x2D }
 //    LocaleScript{  
 //        "Latn",  // ISO 15924 Name 
 //    }
diff --git a/icu4c/source/data/locales/eu_ES.txt b/icu4c/source/data/locales/eu_ES.txt
index 799859cdaea..932ddc39818 100644
--- a/icu4c/source/data/locales/eu_ES.txt
+++ b/icu4c/source/data/locales/eu_ES.txt
@@ -30,5 +30,5 @@ eu_ES {
         "#,##0%",
         "#E0",
     }
-    LocaleID{ "042D"}
+    LocaleID:int { 0x042D }
 }
diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt
index 03d7bb42bcf..e75a47b58c1 100644
--- a/icu4c/source/data/locales/fa.txt
+++ b/icu4c/source/data/locales/fa.txt
@@ -77,7 +77,7 @@ fa {
         "#,##0%",
         "#E0",
     }
-    LocaleID{ "29"}
+    LocaleID:int { 0x29 }
     CollationElements {
         Version { "1.0" }
         Sequence { "[normalization on]" }
diff --git a/icu4c/source/data/locales/fa_IR.txt b/icu4c/source/data/locales/fa_IR.txt
index 36d93b43b8e..94770bd13ca 100644
--- a/icu4c/source/data/locales/fa_IR.txt
+++ b/icu4c/source/data/locales/fa_IR.txt
@@ -30,5 +30,5 @@ fa_IR {
         "#,##0%",
         "#E0",
     }
-    LocaleID{ "0429"}
+    LocaleID:int { 0x0429 }
 }
diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt
index 300512b8995..c696803e3ff 100644
--- a/icu4c/source/data/locales/fi.txt
+++ b/icu4c/source/data/locales/fi.txt
@@ -163,7 +163,7 @@ fi {
         uz { "uzbekki" }
         zh { "kiina" }
     }
-    LocaleID { "0b" }
+    LocaleID:int { 0x0b }
 //    LocaleString { "fi" }
     MonthAbbreviations { 
         "tammi",
diff --git a/icu4c/source/data/locales/fi_FI.txt b/icu4c/source/data/locales/fi_FI.txt
index 411248fbf83..7df423d0920 100644
--- a/icu4c/source/data/locales/fi_FI.txt
+++ b/icu4c/source/data/locales/fi_FI.txt
@@ -20,5 +20,5 @@ fi_FI {
         "#E0",
     }
 //    ShortCountry { "FIN" }
-    LocaleID { "040b" }
+    LocaleID:int { 0x040b }
 }
diff --git a/icu4c/source/data/locales/fo.txt b/icu4c/source/data/locales/fo.txt
index df26100ea77..3c8331e3ed1 100644
--- a/icu4c/source/data/locales/fo.txt
+++ b/icu4c/source/data/locales/fo.txt
@@ -66,7 +66,7 @@ fo {
         "∞",
         "�",
     }
-    LocaleID{ "38" }
+    LocaleID:int { 0x38 }
 //    LocaleScript{ 
 //        "Latn",  // ISO 15924 Name 
 //    }
diff --git a/icu4c/source/data/locales/fo_FO.txt b/icu4c/source/data/locales/fo_FO.txt
index dcc65f55991..87738703480 100644
--- a/icu4c/source/data/locales/fo_FO.txt
+++ b/icu4c/source/data/locales/fo_FO.txt
@@ -31,5 +31,5 @@ fo_FO {
         "#,##0%",
         "#E0",
     }
-    LocaleID{ "0438"}
+    LocaleID:int { 0x0438 }
 }
diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt
index 7befa2d1f83..dbfe45fa82b 100644
--- a/icu4c/source/data/locales/fr.txt
+++ b/icu4c/source/data/locales/fr.txt
@@ -323,7 +323,7 @@ fr {
         "av. J.-C.",
         "ap. J.-C.",
     }
-    LocaleID { "0c" }
+    LocaleID:int { 0x0c }
 //    LocaleString { "fr" }
     MonthAbbreviations { 
         "janv.",
diff --git a/icu4c/source/data/locales/fr_BE.txt b/icu4c/source/data/locales/fr_BE.txt
index 226e90eb3c1..e69f9d4f0cf 100644
--- a/icu4c/source/data/locales/fr_BE.txt
+++ b/icu4c/source/data/locales/fr_BE.txt
@@ -27,7 +27,7 @@ fr_BE {
         "2",
         "1",
     }
-    LocaleID { "080c" }
+    LocaleID:int { 0x080c }
 //    LocaleString { "fr_BE" }
     NumberElements { 
         ",",
diff --git a/icu4c/source/data/locales/fr_CA.txt b/icu4c/source/data/locales/fr_CA.txt
index cebacc91eaf..400573d9504 100644
--- a/icu4c/source/data/locales/fr_CA.txt
+++ b/icu4c/source/data/locales/fr_CA.txt
@@ -23,7 +23,7 @@ fr_CA {
         "yy-MM-dd",
         "{1} {0}",
     }
-    LocaleID { "0c0c" }
+    LocaleID:int { 0x0c0c }
 //    LocaleString { "fr_CA" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
diff --git a/icu4c/source/data/locales/fr_CH.txt b/icu4c/source/data/locales/fr_CH.txt
index 4048150987e..84660959631 100644
--- a/icu4c/source/data/locales/fr_CH.txt
+++ b/icu4c/source/data/locales/fr_CH.txt
@@ -27,7 +27,7 @@ fr_CH {
         "dd.MM.yy",
         "{1} {0}",
     }
-    LocaleID { "100c" }
+    LocaleID:int { 0x100c }
 //    LocaleString { "fr_CH" }
     NumberElements { 
         ".",
diff --git a/icu4c/source/data/locales/fr_FR.txt b/icu4c/source/data/locales/fr_FR.txt
index d0c76db92d4..0abc73a6805 100644
--- a/icu4c/source/data/locales/fr_FR.txt
+++ b/icu4c/source/data/locales/fr_FR.txt
@@ -18,5 +18,5 @@ fr_FR {
     }
 //    LocaleString { "fr_FR" }
 //    ShortCountry { "FRA" }
-    LocaleID { "040c" }
+    LocaleID:int { 0x040c }
 }
diff --git a/icu4c/source/data/locales/fr_LU.txt b/icu4c/source/data/locales/fr_LU.txt
index fd9f129fd8a..cb4ea24874c 100644
--- a/icu4c/source/data/locales/fr_LU.txt
+++ b/icu4c/source/data/locales/fr_LU.txt
@@ -18,5 +18,5 @@ fr_LU {
     }
 //    LocaleString { "fr_LU" }
 //    ShortCountry { "LUX" }
-    LocaleID { "140c" }
+    LocaleID:int { 0x140c }
 }
diff --git a/icu4c/source/data/locales/fr_MC.txt b/icu4c/source/data/locales/fr_MC.txt
index 2b0ef5ebe21..efe4f79e305 100644
--- a/icu4c/source/data/locales/fr_MC.txt
+++ b/icu4c/source/data/locales/fr_MC.txt
@@ -7,7 +7,7 @@
  
 fr_MC{
     Version{ "x0.2" }
-    LocaleID{ "180C"}
+    LocaleID:int { 0x180C }
     CurrencyElements{
         "\u20AC",
         "EUR",
diff --git a/icu4c/source/data/locales/gl.txt b/icu4c/source/data/locales/gl.txt
index 09356950c8a..ed941bffcf7 100644
--- a/icu4c/source/data/locales/gl.txt
+++ b/icu4c/source/data/locales/gl.txt
@@ -67,7 +67,7 @@ gl {
         "∞",
         "�",
     }
-    LocaleID {"56"}
+    LocaleID:int { 0x56 }
 //    LocaleScript{ 
 //        "Latn",  // ISO 15924 Name 
 //    }
diff --git a/icu4c/source/data/locales/gl_ES.txt b/icu4c/source/data/locales/gl_ES.txt
index 2cbc6c77bf7..5d82971e6af 100644
--- a/icu4c/source/data/locales/gl_ES.txt
+++ b/icu4c/source/data/locales/gl_ES.txt
@@ -29,6 +29,6 @@ gl_ES {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID {"0456"}
+    LocaleID:int { 0x0456 }
 
 }
diff --git a/icu4c/source/data/locales/gu.txt b/icu4c/source/data/locales/gu.txt
index a48663a866c..fc431373cab 100644
--- a/icu4c/source/data/locales/gu.txt
+++ b/icu4c/source/data/locales/gu.txt
@@ -1,91 +1,88 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 gu {
- Version{ "x0.1" }
- LocaleID{ "47"}
- AmPmMarkers{
-  "\u0AAA\u0AC2\u0AB0\u0ACD\u0AB5\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8",
-  "\u0A89\u0AA4\u0ACD\u0AA4\u0AB0\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8"
- }
- ShortLanguage{
-  "GUJ"
- }
- DayNames{
-  "\u0AB0\u0AB5\u0ABF\u0AB5\u0ABE\u0AB0",
-  "\u0AB8\u0ACB\u0AAE\u0AB5\u0ABE\u0AB0",
-  "\u0AAE\u0A82\u0A97\u0AB3\u0AB5\u0ABE\u0AB0",
-  "\u0AAC\u0AC1\u0AA7\u0AB5\u0ABE\u0AB0",
-  "\u0A97\u0AC1\u0AB0\u0AC1\u0AB5\u0ABE\u0AB0",
-  "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0\u0AB5\u0ABE\u0AB0",
-  "\u0AB6\u0AA8\u0ABF\u0AB5\u0ABE\u0AB0"
- }
-
- DayAbbreviations{
-  "\u0AB0\u0AB5\u0ABF",
-  "\u0AB8\u0ACB\u0AAE",
-  "\u0AAE\u0A82\u0A97\u0AB3",
-  "\u0AAC\u0AC1\u0AA7",
-  "\u0A97\u0AC1\u0AB0\u0AC1",
-  "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0",
-  "\u0AB6\u0AA8\u0ABF"
- }
-
- MonthNames{
-  "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1\u0A86\u0AB0\u0AC0",
-  "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1\u0A86\u0AB0\u0AC0",
-  "\u0AAE\u0ABE\u0AB0\u0ACD\u0A9A",
-  "\u0A8F\u0AAA\u0ACD\u0AB0\u0ABF\u0AB2",
-  "\u0AAE\u0AC7",
-  "\u0A9C\u0AC2\u0AA8",
-  "\u0A9C\u0AC1\u0AB2\u0ABE\u0A88",
-  "\u0A91\u0A97\u0AB8\u0ACD\u0A9F",
-  "\u0AB8\u0AAA\u0ACD\u0A9F\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0",
-  "\u0A91\u0A95\u0ACD\u0A9F\u0ACD\u0AAC\u0AB0",
-  "\u0AA8\u0AB5\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0",
-  "\u0AA1\u0ABF\u0AB8\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0",
-  ""
- }
-
- MonthAbbreviations {
-  "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1",
-  "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1",
-  "\u0AAE\u0ABE\u0AB0\u0ACD\u0A9A",
-  "\u0A8F\u0AAA\u0ACD\u0AB0\u0ABF\u0AB2",
-  "\u0AAE\u0AC7",
-  "\u0A9C\u0AC2\u0AA8",
-  "\u0A9C\u0AC1\u0AB2\u0ABE\u0A88",
-  "\u0A91\u0A97\u0AB8\u0ACD\u0A9F",
-  "\u0AB8\u0AAA\u0ACD\u0A9F\u0AC7",
-  "\u0A91\u0A95\u0ACD\u0A9F\u0ACB",
-  "\u0AA8\u0AB5\u0AC7",
-  "\u0AA1\u0ABF\u0AB8\u0AC7",
-  ""
- }
-
- NumberElements{
-  ".",
-  ",",
-  ",",
-  "%",
-  ",",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Gujr" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.2" }
+    LocaleID:int { 0x47 }
+    AmPmMarkers{
+        "\u0AAA\u0AC2\u0AB0\u0ACD\u0AB5\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8",
+        "\u0A89\u0AA4\u0ACD\u0AA4\u0AB0\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8"
+    }
+//    ShortLanguage{
+//        "GUJ"
+//    }
+    DayNames{
+        "\u0AB0\u0AB5\u0ABF\u0AB5\u0ABE\u0AB0",
+        "\u0AB8\u0ACB\u0AAE\u0AB5\u0ABE\u0AB0",
+        "\u0AAE\u0A82\u0A97\u0AB3\u0AB5\u0ABE\u0AB0",
+        "\u0AAC\u0AC1\u0AA7\u0AB5\u0ABE\u0AB0",
+        "\u0A97\u0AC1\u0AB0\u0AC1\u0AB5\u0ABE\u0AB0",
+        "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0\u0AB5\u0ABE\u0AB0",
+        "\u0AB6\u0AA8\u0ABF\u0AB5\u0ABE\u0AB0"
     }
- }
 
+    DayAbbreviations{
+        "\u0AB0\u0AB5\u0ABF",
+        "\u0AB8\u0ACB\u0AAE",
+        "\u0AAE\u0A82\u0A97\u0AB3",
+        "\u0AAC\u0AC1\u0AA7",
+        "\u0A97\u0AC1\u0AB0\u0AC1",
+        "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0",
+        "\u0AB6\u0AA8\u0ABF"
+    }
+
+    MonthNames{
+        "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1\u0A86\u0AB0\u0AC0",
+        "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1\u0A86\u0AB0\u0AC0",
+        "\u0AAE\u0ABE\u0AB0\u0ACD\u0A9A",
+        "\u0A8F\u0AAA\u0ACD\u0AB0\u0ABF\u0AB2",
+        "\u0AAE\u0AC7",
+        "\u0A9C\u0AC2\u0AA8",
+        "\u0A9C\u0AC1\u0AB2\u0ABE\u0A88",
+        "\u0A91\u0A97\u0AB8\u0ACD\u0A9F",
+        "\u0AB8\u0AAA\u0ACD\u0A9F\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0",
+        "\u0A91\u0A95\u0ACD\u0A9F\u0ACD\u0AAC\u0AB0",
+        "\u0AA8\u0AB5\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0",
+        "\u0AA1\u0ABF\u0AB8\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0",
+    }
+
+    MonthAbbreviations {
+        "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1",
+        "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1",
+        "\u0AAE\u0ABE\u0AB0\u0ACD\u0A9A",
+        "\u0A8F\u0AAA\u0ACD\u0AB0\u0ABF\u0AB2",
+        "\u0AAE\u0AC7",
+        "\u0A9C\u0AC2\u0AA8",
+        "\u0A9C\u0AC1\u0AB2\u0ABE\u0A88",
+        "\u0A91\u0A97\u0AB8\u0ACD\u0A9F",
+        "\u0AB8\u0AAA\u0ACD\u0A9F\u0AC7",
+        "\u0A91\u0A95\u0ACD\u0A9F\u0ACB",
+        "\u0AA8\u0AB5\u0AC7",
+        "\u0AA1\u0ABF\u0AB8\u0AC7",
+    }
+
+    NumberElements{
+        ".",
+        ",",
+        ",",
+        "%",
+        ",",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript:array { "Gujr" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/gu_IN.txt b/icu4c/source/data/locales/gu_IN.txt
index 5dcf9460d92..b13dabe0f59 100644
--- a/icu4c/source/data/locales/gu_IN.txt
+++ b/icu4c/source/data/locales/gu_IN.txt
@@ -6,8 +6,8 @@
 // ***************************************************************************
 
 gu_IN {
-    Version { "x0.2" }
-    LocaleID { "0447" }
+    Version { "x0.3" }
+    LocaleID:int { 0x0447 }
     //ShortCountry { IND }
     CurrencyElements {
         "\u0AB0\u0AC1",
diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt
index 51628e9ed7a..a618b55f595 100644
--- a/icu4c/source/data/locales/he.txt
+++ b/icu4c/source/data/locales/he.txt
@@ -54,7 +54,7 @@ he {
         he { "\u05E2\u05D1\u05E8\u05D9\u05EA" }
         //iw { "\u05E2\u05D1\u05E8\u05D9\u05EA" } //Use he instead
     }
-    LocaleID { "0d" }
+    LocaleID:int { 0x0d }
 //    LocaleString { "he" }
     MonthAbbreviations { 
         "\u05D9\u05E0\u05D5",
diff --git a/icu4c/source/data/locales/he_IL.txt b/icu4c/source/data/locales/he_IL.txt
index 67d37c95f6a..10051c30af8 100644
--- a/icu4c/source/data/locales/he_IL.txt
+++ b/icu4c/source/data/locales/he_IL.txt
@@ -20,5 +20,5 @@ he_IL {
         "#E0",
     }
 //    ShortCountry { "ISR" }
-    LocaleID { "040d" }
+    LocaleID:int { 0x040d }
 }
diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt
index bce92b6c8db..61869d61a7c 100644
--- a/icu4c/source/data/locales/hi.txt
+++ b/icu4c/source/data/locales/hi.txt
@@ -11,8 +11,8 @@
 //  -  Arundhati Bhowmick [IBM Cupertino]
 
 hi {
-    LocaleID { "39" }
     Version { "1.1" }
+    LocaleID:int { 0x39 }
 //    ShortLanguage { hin }
 
     Languages {
diff --git a/icu4c/source/data/locales/hi_IN.txt b/icu4c/source/data/locales/hi_IN.txt
index f37383802da..537c13ae8b1 100644
--- a/icu4c/source/data/locales/hi_IN.txt
+++ b/icu4c/source/data/locales/hi_IN.txt
@@ -36,5 +36,5 @@ hi_IN {
 //        "1",
 //        "1"
 //    }
-    LocaleID { "0439" }
+    LocaleID:int { 0x0439 }
 }
diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt
index 74c49a8f79a..b3343aaec09 100644
--- a/icu4c/source/data/locales/hr.txt
+++ b/icu4c/source/data/locales/hr.txt
@@ -52,7 +52,7 @@ hr {
     Languages { 
         hr { "hrvatski" }
     }
-    LocaleID { "1a" }
+    LocaleID:int { 0x1a }
 //    LocaleString { "hr" }
     MonthAbbreviations { 
         "sij",
diff --git a/icu4c/source/data/locales/hr_HR.txt b/icu4c/source/data/locales/hr_HR.txt
index ab35df2e688..eba7c1a7232 100644
--- a/icu4c/source/data/locales/hr_HR.txt
+++ b/icu4c/source/data/locales/hr_HR.txt
@@ -19,5 +19,5 @@ hr_HR {
 //        "#,##0%",
 //    }
 //    ShortCountry { "HRV" }
-    LocaleID { "041a" }
+    LocaleID:int { 0x041a }
 }
diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt
index 67141676853..0a6b3392d1d 100644
--- a/icu4c/source/data/locales/hu.txt
+++ b/icu4c/source/data/locales/hu.txt
@@ -58,7 +58,7 @@ hu {
     Languages { 
         hu { "magyar" }
     }
-    LocaleID { "0e" }
+    LocaleID:int { 0x0e }
 //    LocaleString { "hu" }
     MonthAbbreviations { 
         "jan.",
diff --git a/icu4c/source/data/locales/hu_HU.txt b/icu4c/source/data/locales/hu_HU.txt
index 08d433e0a46..4b15a10413f 100644
--- a/icu4c/source/data/locales/hu_HU.txt
+++ b/icu4c/source/data/locales/hu_HU.txt
@@ -20,5 +20,5 @@ hu_HU {
         "#E0",
     }
 //    ShortCountry { "HUN" }
-    LocaleID { "040e" }
+    LocaleID:int { 0x040e }
 }
diff --git a/icu4c/source/data/locales/hy.txt b/icu4c/source/data/locales/hy.txt
index 83af6b841a8..e1fab48f621 100644
--- a/icu4c/source/data/locales/hy.txt
+++ b/icu4c/source/data/locales/hy.txt
@@ -1,4 +1,4 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -9,124 +9,119 @@
 // *         Arminco Global Telecommunications
 // *         Jora Manoucherians
 // *         Richard Youatt
-// *******************************************************************************
+// ***************************************************************************
 
 hy{
-    Version { "x0.1" }
+    Version { "x0.2" }
 
     AmPmMarkers {
-            "\u0531\u057c\u2024",
-            "\u0535\u0580\u2024",
-            "\u0531\u057c\u0561\u0582\u0585\u057f\u0565\u0561\u0576",
-            "\u0535\u0580\u0565\u056f\u0578\u0575\u0565\u0561\u0576"
+        "\u0531\u057c\u2024",
+        "\u0535\u0580\u2024",
 
+//      ICU will only use the first two strings.
+//        "\u0531\u057c\u0561\u0582\u0585\u057f\u0565\u0561\u0576",
+//        "\u0535\u0580\u0565\u056f\u0578\u0575\u0565\u0561\u0576"
     }
     DayAbbreviations {
-            "\u053f\u056b\u0580",
-            "\u0535\u0580\u056f",
-            "\u0535\u0580\u0584",
-            "\u0549\u0578\u0580",
-            "\u0540\u0576\u0563",
-            "\u0548\u0582\u0580",
-            "\u0547\u0561\u0562",
+        "\u053f\u056b\u0580",
+        "\u0535\u0580\u056f",
+        "\u0535\u0580\u0584",
+        "\u0549\u0578\u0580",
+        "\u0540\u0576\u0563",
+        "\u0548\u0582\u0580",
+        "\u0547\u0561\u0562",
     }
     DayNames {
-            "\u053f\u056b\u0580\u0561\u056f\u056b",
-            "\u0535\u0580\u056f\u0578\u0582\u0577\u0561\u0562\u0569\u056b",
-            "\u0535\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b",
-            "\u0549\u0578\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b",
-            "\u0540\u056b\u0576\u0563\u0577\u0561\u0562\u0569\u056b",
-            "\u0548\u0582\u0580\u0562\u0561\u0569",
-            "\u0547\u0561\u0562\u0561\u0569",
+        "\u053f\u056b\u0580\u0561\u056f\u056b",
+        "\u0535\u0580\u056f\u0578\u0582\u0577\u0561\u0562\u0569\u056b",
+        "\u0535\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b",
+        "\u0549\u0578\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b",
+        "\u0540\u056b\u0576\u0563\u0577\u0561\u0562\u0569\u056b",
+        "\u0548\u0582\u0580\u0562\u0561\u0569",
+        "\u0547\u0561\u0562\u0561\u0569",
     }
     MonthAbbreviations {
-            "\u0545\u0576\u0580",
-            "\u0553\u057f\u0580",
-            "\u0544\u0580\u057f",
-            "\u0531\u057a\u0580",
-            "\u0544\u0575\u057d",
-            "\u0545\u0576\u057d",
-            "\u0545\u056c\u057d",
-            "\u0555\u0563\u057d",
-            "\u054d\u0565\u057a",
-            "\u0540\u0578\u056f",
-            "\u0546\u0578\u0575",
-            "\u0534\u0565\u056f",
-            "",
+        "\u0545\u0576\u0580",
+        "\u0553\u057f\u0580",
+        "\u0544\u0580\u057f",
+        "\u0531\u057a\u0580",
+        "\u0544\u0575\u057d",
+        "\u0545\u0576\u057d",
+        "\u0545\u056c\u057d",
+        "\u0555\u0563\u057d",
+        "\u054d\u0565\u057a",
+        "\u0540\u0578\u056f",
+        "\u0546\u0578\u0575",
+        "\u0534\u0565\u056f",
     }
     MonthNames {
-            "\u0545\u0578\u0582\u0576\u0578\u0582\u0561\u0580",
-            "\u0553\u0565\u057f\u0580\u0578\u0582\u0561\u0580",
-            "\u0544\u0561\u0580\u057f",
-            "\u0531\u057a\u0580\u056b\u056c",
-            "\u0544\u0561\u0575\u056b\u057d",
-            "\u0545\u0578\u0582\u0576\u056b\u057d",
-            "\u0545\u0578\u0582\u056c\u056b\u057d",
-            "\u0555\u0563\u0578\u057d\u057f\u0578\u057d",
-            "\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580",
-            "\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580",
-            "\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580",
-            "\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580",
-            "",
+        "\u0545\u0578\u0582\u0576\u0578\u0582\u0561\u0580",
+        "\u0553\u0565\u057f\u0580\u0578\u0582\u0561\u0580",
+        "\u0544\u0561\u0580\u057f",
+        "\u0531\u057a\u0580\u056b\u056c",
+        "\u0544\u0561\u0575\u056b\u057d",
+        "\u0545\u0578\u0582\u0576\u056b\u057d",
+        "\u0545\u0578\u0582\u056c\u056b\u057d",
+        "\u0555\u0563\u0578\u057d\u057f\u0578\u057d",
+        "\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580",
+        "\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580",
+        "\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580",
+        "\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580",
     }
 
     Eras {
-      "\u0545\u2024\u054F\u2024",            // 3.D.
-      "\u0546\u2024\u0554\u2024"             // N.K.
+        "\u0545\u2024\u054F\u2024",            // 3.D.
+        "\u0546\u2024\u0554\u2024"             // N.K.
     }
     LocaleScript{
-                "Armn", // Script Name
+        "Armn", // Script Name
     }
     Countries{
-        AM {
-     "\u0540\u0561\u0575\u0561\u057D\u057F\u0561\u0576\u056B\u0020"
-"\u0540\u0561\u0576\u0580\u0561\u057A\u0565\u057F\u0578\u0582\u0569"
-     "\u056B\u0582\u0576"}
+        AM { "\u0540\u0561\u0575\u0561\u057D\u057F\u0561\u0576\u056B\u0020"
+            "\u0540\u0561\u0576\u0580\u0561\u057A\u0565\u057F\u0578\u0582\u0569"
+            "\u056B\u0582\u0576" }
     }
     Languages{
       hy { "\u0540\u0561\u0575\u0565\u0580\u0567\u0576" }
     }
-    LocaleString{ "hy" }
-    LocaleID{ "2b" }
+//    LocaleString{ "hy" }
+    LocaleID:int { 0x2b }
 
-            // /**************** Info Below is needed ****************/
-            // CollationElements{}    // To be supplied from Unicode
-            // ShortLanguage { }
-            //
+    // /**************** Info Below is needed ****************/
+    // CollationElements{}    // To be supplied from Unicode
+    //
 
-     DateTimePatterns {
-      "HH:mm:ss z",
-      "H:mm:ss z",
-      "H:mm:ss",
-      "H:mm",
-      "EEEE,MMMM d, yyyy",
-      "MMMM dd, yyyy",
-      "MMM d, yyyy",
-      "MM/dd/yy",
-      "{1} {0}",
-     }
-
-     localPatternChars{ "GyMdkHmsSEDFwWahKz" }
-
-      NumberPatterns{
-             "#0,###;-#0,###",
-             "#0,00 \u00A4;-#0,00 \u00A4",
-             "#0%"
-
-      }
-      NumberElements {
-              ".",
-              ",",
-              ";",
-              "%",
-              "0",
-              "#",
-              "-",
-              "E",
-              "\u2030",
-              "\u221e",
-              "\ufffd",
-      }
+    DateTimePatterns {
+        "HH:mm:ss z",
+        "H:mm:ss z",
+        "H:mm:ss",
+        "H:mm",
+        "EEEE,MMMM d, yyyy",
+        "MMMM dd, yyyy",
+        "MMM d, yyyy",
+        "MM/dd/yy",
+        "{1} {0}",
+    }
 
+    localPatternChars{ "GyMdkHmsSEDFwWahKz" }
 
+    NumberPatterns{
+        "#0,###;-#0,###",
+        "#0,00 \u00A4;-#0,00 \u00A4",
+        "#0%",
+        "#E0",
+    }
+    NumberElements {
+        ".",
+        ",",
+        ";",
+        "%",
+        "0",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
 }
diff --git a/icu4c/source/data/locales/hy_AM.txt b/icu4c/source/data/locales/hy_AM.txt
index 6e19954a03b..1250c8edac7 100644
--- a/icu4c/source/data/locales/hy_AM.txt
+++ b/icu4c/source/data/locales/hy_AM.txt
@@ -1,4 +1,4 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -9,17 +9,17 @@
 // *         Arminco Global Telecommunications
 // *         Jora Manoucherians
 // *         Richard Youatt
-// *******************************************************************************
+// ***************************************************************************
 
 hy_AM{
-    Version { "x0.1" }
+    Version { "x0.2" }
 
-    LocaleString { "hy_AM" }
+//    LocaleString { "hy_AM" }
     Eras {
-      "\u0554\u2024\u0531\u2024",      // K.A.
-      "\u0554\u2024\u0535\u2024"       // K.E.
+        "\u0554\u2024\u0531\u2024",      // K.A.
+        "\u0554\u2024\u0535\u2024"       // K.E.
     }
-    LocaleID{ "042b" }
+    LocaleID:int { 0x042b }
 }
 
 
diff --git a/icu4c/source/data/locales/hy_AM_REVISED.txt b/icu4c/source/data/locales/hy_AM_REVISED.txt
index a1a4c5b2499..4d776911324 100644
--- a/icu4c/source/data/locales/hy_AM_REVISED.txt
+++ b/icu4c/source/data/locales/hy_AM_REVISED.txt
@@ -1,4 +1,4 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -9,64 +9,63 @@
 // *         Arminco Global Telecommunications
 // *         Jora Manoucherians
 // *         Richard Youatt
-// *******************************************************************************
+// ***************************************************************************
 
 hy_AM_REVISED{
-    Version { "x0.1" }
+    Version { "x0.2" }
 
     AmPmMarkers {
-            "\u0531\u057C\u2024",
-            "\u053F\u0565\u2024",
-            "\u0531\u057c\u0561\u057E\u0578\u057f\u0575\u0561\u0576",
-            "\u0535\u0580\u0565\u056f\u0578\u0575\u0561\u0576"
+        "\u0531\u057C\u2024",
+        "\u053F\u0565\u2024",
 
+//      ICU will only use the first two strings.
+//        "\u0531\u057c\u0561\u057E\u0578\u057f\u0575\u0561\u0576",
+//        "\u0535\u0580\u0565\u056f\u0578\u0575\u0561\u0576"
     }
     MonthAbbreviations {
-            "\u0540\u0576\u057e",
-            "\u0553\u057f\u057e",
-            "\u0544\u0580\u057f",
-            "\u0531\u057a\u0580",
-            "\u0544\u0575\u057d",
-            "\u0540\u0576\u057d",
-            "\u0540\u056c\u057d",
-            "\u0555\u0563\u057d",
-            "\u054d\u0565\u057a",
-            "\u0540\u0578\u056f",
-            "\u0546\u0578\u0575",
-            "\u0534\u0565\u056f",
-            "",
+        "\u0540\u0576\u057e",
+        "\u0553\u057f\u057e",
+        "\u0544\u0580\u057f",
+        "\u0531\u057a\u0580",
+        "\u0544\u0575\u057d",
+        "\u0540\u0576\u057d",
+        "\u0540\u056c\u057d",
+        "\u0555\u0563\u057d",
+        "\u054d\u0565\u057a",
+        "\u0540\u0578\u056f",
+        "\u0546\u0578\u0575",
+        "\u0534\u0565\u056f",
     }
     MonthNames {
-            "\u0540\u0578\u0582\u0576\u057e\u0561\u0580",
-            "\u0553\u0565\u057f\u0580\u057e\u0561\u0580",
-            "\u0544\u0561\u0580\u057f",
-            "\u0531\u057a\u0580\u056b\u056c",
-            "\u0544\u0561\u0575\u056b\u057d",
-            "\u0540\u0578\u0582\u0576\u056b\u057d",
-            "\u0540\u0578\u0582\u056c\u056b\u057d",
-            "\u0555\u0563\u0578\u057d\u057f\u0578\u057d",
-            "\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580",
-            "\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580",
-            "\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580",
-            "\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580",
-            "",
+        "\u0540\u0578\u0582\u0576\u057e\u0561\u0580",
+        "\u0553\u0565\u057f\u0580\u057e\u0561\u0580",
+        "\u0544\u0561\u0580\u057f",
+        "\u0531\u057a\u0580\u056b\u056c",
+        "\u0544\u0561\u0575\u056b\u057d",
+        "\u0540\u0578\u0582\u0576\u056b\u057d",
+        "\u0540\u0578\u0582\u056c\u056b\u057d",
+        "\u0555\u0563\u0578\u057d\u057f\u0578\u057d",
+        "\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580",
+        "\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580",
+        "\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580",
+        "\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580",
     }
     Eras {
-      "\u0544\u2024\u0539\u2024\u0531\u2024",
-      "\u0544\u2024\u0539\u2024"
+        "\u0544\u2024\u0539\u2024\u0531\u2024",
+        "\u0544\u2024\u0539\u2024"
     }
 
-    LocaleString{ "hy_AM_REVISED" }
+//    LocaleString{ "hy_AM_REVISED" }
 
-     DateTimePatterns {
-      "HH:mm:ss z",
-      "H:mm:ss z",
-      "h:mm:ss",
-      "h:mm",
-      "EEEE,d MMMM, yyyy",
-      "d MMMM yyyy",
-      "d MMM yyyy",
-      "dd-MM-yy",
-      "{1} {0}",
-     }
+    DateTimePatterns {
+        "HH:mm:ss z",
+        "H:mm:ss z",
+        "h:mm:ss",
+        "h:mm",
+        "EEEE,d MMMM, yyyy",
+        "d MMMM yyyy",
+        "d MMM yyyy",
+        "dd-MM-yy",
+        "{1} {0}",
+    }
 }  
diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt
index 7cba34fcd4a..0d1f7eea2d3 100644
--- a/icu4c/source/data/locales/id.txt
+++ b/icu4c/source/data/locales/id.txt
@@ -72,16 +72,16 @@ id {
         "#,##0%",
         "#E0",
     }
-    LocaleID{ "21"}
+    LocaleID:int { 0x21 }
 //    LocaleScript{ 
 //        "Latn",  // ISO 15924 Name 
 //    }
-            // /**************** Info Below is needed ****************/
-            // CollationElements{}
-            // Countries{}
-            // Eras{}
-            // Languages{}
-            // ShortLanguage { }
-            // localPatternChars{}
-            //
+    // /**************** Info Below is needed ****************/
+    // CollationElements{}
+    // Countries{}
+    // Eras{}
+    // Languages{}
+    // ShortLanguage { }
+    // localPatternChars{}
+    //
 }
diff --git a/icu4c/source/data/locales/id_ID.txt b/icu4c/source/data/locales/id_ID.txt
index 9f787aec55f..55846e6e04b 100644
--- a/icu4c/source/data/locales/id_ID.txt
+++ b/icu4c/source/data/locales/id_ID.txt
@@ -23,5 +23,5 @@ id_ID {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID{ "0421"}
+    LocaleID:int { 0x0421 }
 }
diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt
index 3a280433495..c5b40687292 100644
--- a/icu4c/source/data/locales/is.txt
+++ b/icu4c/source/data/locales/is.txt
@@ -49,7 +49,7 @@ is {
     Languages { 
         is { "\u00EDslenska" }
     }
-    LocaleID { "0f" }
+    LocaleID:int { 0x0f }
 //    LocaleString { "is" }
     MonthAbbreviations { 
         "jan.",
diff --git a/icu4c/source/data/locales/is_IS.txt b/icu4c/source/data/locales/is_IS.txt
index 7c5a51fa001..da67bfe7ec5 100644
--- a/icu4c/source/data/locales/is_IS.txt
+++ b/icu4c/source/data/locales/is_IS.txt
@@ -20,5 +20,5 @@ is_IS {
         "#E0",
     }
 //    ShortCountry { "ISL" }
-    LocaleID { "040f" }
+    LocaleID:int { 0x040f }
 }
diff --git a/icu4c/source/data/locales/it.txt b/icu4c/source/data/locales/it.txt
index 3439d956411..29e90bfd26d 100644
--- a/icu4c/source/data/locales/it.txt
+++ b/icu4c/source/data/locales/it.txt
@@ -57,7 +57,7 @@ it {
     Languages { 
         it { "italiano" }
     }
-    LocaleID { "10" }
+    LocaleID:int { 0x10 }
 //    LocaleString { "it" }
     MonthAbbreviations { 
         "gen",
diff --git a/icu4c/source/data/locales/it_CH.txt b/icu4c/source/data/locales/it_CH.txt
index 7fc623d3ab5..58c9c8adf23 100644
--- a/icu4c/source/data/locales/it_CH.txt
+++ b/icu4c/source/data/locales/it_CH.txt
@@ -23,7 +23,7 @@ it_CH {
         "dd.MM.yy",
         "{1} {0}",
     }
-    LocaleID { "0810" }
+    LocaleID:int { 0x0810 }
 //    LocaleString { "it_CH" }
     NumberElements { 
         ".",
diff --git a/icu4c/source/data/locales/it_IT.txt b/icu4c/source/data/locales/it_IT.txt
index 82410251983..bbf00e49ea3 100644
--- a/icu4c/source/data/locales/it_IT.txt
+++ b/icu4c/source/data/locales/it_IT.txt
@@ -19,5 +19,5 @@ it_IT {
 //        "#,##0%",
 //    }
 //    ShortCountry { "ITA" }
-    LocaleID { "0410" }
+    LocaleID:int { 0x0410 }
 }
diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt
index d182f7c3a9d..38ccff7d0f9 100644
--- a/icu4c/source/data/locales/ja.txt
+++ b/icu4c/source/data/locales/ja.txt
@@ -1687,7 +1687,7 @@ ja {
         za { "\u30c1\u30ef\u30f3\u8a9e" }
         zu { "\u30ba\u30fc\u30eb\u30fc\u8a9e" }
     }
-    LocaleID { "11" }
+    LocaleID:int { 0x11 }
 //    LocaleString { "ja" }
     MonthAbbreviations { 
         "1",
diff --git a/icu4c/source/data/locales/ja_JP.txt b/icu4c/source/data/locales/ja_JP.txt
index b3257ba7b9c..31acb5ffed8 100644
--- a/icu4c/source/data/locales/ja_JP.txt
+++ b/icu4c/source/data/locales/ja_JP.txt
@@ -20,5 +20,5 @@ ja_JP {
         "#E0",
     }
 //    ShortCountry { "JPN" }
-    LocaleID { "0411" }
+    LocaleID:int { 0x0411 }
 }
diff --git a/icu4c/source/data/locales/ka.txt b/icu4c/source/data/locales/ka.txt
index 77f6c1ddabd..3df09b6cb60 100644
--- a/icu4c/source/data/locales/ka.txt
+++ b/icu4c/source/data/locales/ka.txt
@@ -6,81 +6,79 @@
 // *******************************************************************************
 
 ka{
- Version{ "x0.1" }
- LocaleID{ "37"}
- ShortLanguage{
-  "KAT"
- }
- DayNames{
-  "\u10D9\u10D5\u10D8\u10E0\u10D0",
-  "\u10DD\u10E0\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
-  "\u10E1\u10D0\u10DB\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
-  "\u10DD\u10D7\u10EE\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
-  "\u10EE\u10E3\u10D7\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
-  "\u10DE\u10D0\u10E0\u10D0\u10E1\u10D9\u10D4\u10D5\u10D8",
-  "\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8"
- }
-
- DayAbbreviations{
-  "\u10D9\u10D5\u10D8\u10E0\u10D0",
-  "\u10DD\u10E0\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
-  "\u10E1\u10D0\u10DB\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
-  "\u10DD\u10D7\u10EE\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
-  "\u10EE\u10E3\u10D7\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
-  "\u10DE\u10D0\u10E0\u10D0\u10E1\u10D9\u10D4\u10D5\u10D8",
-  "\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8"
- }
-
- MonthNames{
-  "\u10D8\u10D0\u10DC\u10D5\u10D0\u10E0\u10D8",
-  "\u10D7\u10D4\u10D1\u10D4\u10E0\u10D5\u10D0\u10DA\u10D8",
-  "\u10DB\u10D0\u10E0\u10E2\u10D8",
-  "\u10D0\u10DE\u10E0\u10D8\u10DA\u10D8",
-  "\u10DB\u10D0\u10D8\u10E1\u10D8",
-  "\u10D8\u10D5\u10DC\u10D8\u10E1\u10D8",
-  "\u10D8\u10D5\u10DA\u10D8\u10E1\u10D8",
-  "\u10D0\u10D2\u10D5\u10D8\u10E1\u10E2\u10DD",
-  "\u10E1\u10D4\u10E5\u10E2\u10D4\u10DB\u10D1\u10D4\u10E0\u10D8",
-  "\u10DD\u10E5\u10E2\u10DD\u10DB\u10D1\u10D4\u10E0\u10D8",
-  "\u10DC\u10DD\u10D4\u10DB\u10D1\u10D4\u10E0\u10D8",
-  "\u10D3\u10D4\u10D9\u10D4\u10DB\u10D1\u10D4\u10E0\u10D8",
-  ""
- }
-
- MonthAbbreviations{
-  "\u10D8\u10D0\u10DC",
-  "\u10D7\u10D4\u10D1",
-  "\u10DB\u10D0\u10E0",
-  "\u10D0\u10DE\u10E0",
-  "\u10DB\u10D0\u10D8\u10E1",
-  "\u10D8\u10D5\u10DC",
-  "\u10D8\u10D5\u10DA",
-  "\u10D0\u10D2\u10D5",
-  "\u10E1\u10D4\u10E5",
-  "\u10DD\u10E5\u10E2",
-  "\u10DC\u10DD\u10D4\u10DB",
-  "\u10D3\u10D4\u10D9",
-  ""
- }
-
- NumberElements{
-  ",",
-  "\u00A0",
-  ";",
-  "%",
-  ";",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Geor" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.2" }
+    LocaleID:int { 0x37 }
+//    ShortLanguage{
+//        "KAT"
+//    }
+    DayNames{
+        "\u10D9\u10D5\u10D8\u10E0\u10D0",
+        "\u10DD\u10E0\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
+        "\u10E1\u10D0\u10DB\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
+        "\u10DD\u10D7\u10EE\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
+        "\u10EE\u10E3\u10D7\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
+        "\u10DE\u10D0\u10E0\u10D0\u10E1\u10D9\u10D4\u10D5\u10D8",
+        "\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8"
+    }
+
+    DayAbbreviations{
+        "\u10D9\u10D5\u10D8\u10E0\u10D0",
+        "\u10DD\u10E0\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
+        "\u10E1\u10D0\u10DB\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
+        "\u10DD\u10D7\u10EE\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
+        "\u10EE\u10E3\u10D7\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8",
+        "\u10DE\u10D0\u10E0\u10D0\u10E1\u10D9\u10D4\u10D5\u10D8",
+        "\u10E8\u10D0\u10D1\u10D0\u10D7\u10D8"
+    }
+
+    MonthNames{
+        "\u10D8\u10D0\u10DC\u10D5\u10D0\u10E0\u10D8",
+        "\u10D7\u10D4\u10D1\u10D4\u10E0\u10D5\u10D0\u10DA\u10D8",
+        "\u10DB\u10D0\u10E0\u10E2\u10D8",
+        "\u10D0\u10DE\u10E0\u10D8\u10DA\u10D8",
+        "\u10DB\u10D0\u10D8\u10E1\u10D8",
+        "\u10D8\u10D5\u10DC\u10D8\u10E1\u10D8",
+        "\u10D8\u10D5\u10DA\u10D8\u10E1\u10D8",
+        "\u10D0\u10D2\u10D5\u10D8\u10E1\u10E2\u10DD",
+        "\u10E1\u10D4\u10E5\u10E2\u10D4\u10DB\u10D1\u10D4\u10E0\u10D8",
+        "\u10DD\u10E5\u10E2\u10DD\u10DB\u10D1\u10D4\u10E0\u10D8",
+        "\u10DC\u10DD\u10D4\u10DB\u10D1\u10D4\u10E0\u10D8",
+        "\u10D3\u10D4\u10D9\u10D4\u10DB\u10D1\u10D4\u10E0\u10D8",
+    }
+
+    MonthAbbreviations{
+        "\u10D8\u10D0\u10DC",
+        "\u10D7\u10D4\u10D1",
+        "\u10DB\u10D0\u10E0",
+        "\u10D0\u10DE\u10E0",
+        "\u10DB\u10D0\u10D8\u10E1",
+        "\u10D8\u10D5\u10DC",
+        "\u10D8\u10D5\u10DA",
+        "\u10D0\u10D2\u10D5",
+        "\u10E1\u10D4\u10E5",
+        "\u10DD\u10E5\u10E2",
+        "\u10DC\u10DD\u10D4\u10DB",
+        "\u10D3\u10D4\u10D9",
+    }
+
+    NumberElements{
+        ",",
+        "\u00A0",
+        ";",
+        "%",
+        ";",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript:array { "Geor" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/ka_GE.txt b/icu4c/source/data/locales/ka_GE.txt
index 5b5ded4654a..72127003aa8 100644
--- a/icu4c/source/data/locales/ka_GE.txt
+++ b/icu4c/source/data/locales/ka_GE.txt
@@ -1,34 +1,34 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 ka_GE{
- Version{ "x0.1" }
- ShortCountry{
-  "GEO"
- }
- LocaleID{ "0437"}
- CurrencyElements{
-  "Lari",
-  "GEL",
-  ","
- }
- DateTimePatterns{
-  "hh:mm:ss aa",
-  "H:mm:ss",
-  "H:mm:ss",
-  "HH:mm:ss",
-  "yyyy '\u10EC\u10DA\u10D8\u10E1' dd MM",
-  "yyyy '\u10EC\u10DA\u10D8\u10E1' dd MM, EEEE",
-  "dd.MM.yyyy",
-  "dd.MM.yy",
-  "{1} {0}",
- }
- DateTimeElements{
-  "0",
-  "1"
- }
+    Version{ "x0.2" }
+// ShortCountry{
+//  "GEO"
+// }
+    LocaleID:int { 0x0437 }
+    CurrencyElements{
+        "Lari",
+        "GEL",
+        ","
+    }
+    DateTimePatterns{
+        "hh:mm:ss aa",
+        "H:mm:ss",
+        "H:mm:ss",
+        "HH:mm:ss",
+        "yyyy '\u10EC\u10DA\u10D8\u10E1' dd MM",
+        "yyyy '\u10EC\u10DA\u10D8\u10E1' dd MM, EEEE",
+        "dd.MM.yyyy",
+        "dd.MM.yy",
+        "{1} {0}",
+    }
+    DateTimeElements{
+        "0",
+        "1"
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/kk.txt b/icu4c/source/data/locales/kk.txt
index 35c3051b3be..15458ecd100 100644
--- a/icu4c/source/data/locales/kk.txt
+++ b/icu4c/source/data/locales/kk.txt
@@ -1,85 +1,83 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 kk{
-    Version{ "x0.1" }
-    LocaleID{ "3f"}
+    Version{ "x0.2" }
+    LocaleID:int { 0x3f }
     DateTimePatterns { 
-            "hh:mm:ss aa",
-            "H:mm:ss",
-            "H:mm:ss",
-            "HH:mm:ss",
-            "d MMMM yyyy '\u0436.'",
-            "EEEE,dd MMMM yyyy '\u0436.'HH:mm:ss z",
-            "dd.MM.yyyy",
-            "dd.MM.yy",
-            "{1} {0}",
+        "hh:mm:ss aa",
+        "H:mm:ss",
+        "H:mm:ss",
+        "HH:mm:ss",
+        "d MMMM yyyy '\u0436.'",
+        "EEEE,dd MMMM yyyy '\u0436.'HH:mm:ss z",
+        "dd.MM.yyyy",
+        "dd.MM.yy",
+        "{1} {0}",
     }
     DayAbbreviations { 
-            "\u0436\u0441.",
-            "\u0434\u0441.",
-            "\u0441\u0441.",
-            "\u0441\u0440.",
-            "\u0431\u0441.",
-            "\u0436\u043C.",
-            "\u0441\u04BB.",
+        "\u0436\u0441.",
+        "\u0434\u0441.",
+        "\u0441\u0441.",
+        "\u0441\u0440.",
+        "\u0431\u0441.",
+        "\u0436\u043C.",
+        "\u0441\u04BB.",
     }
     DayNames { 
-            "\u0436\u0435\u043A\u0441\u0435\u043D\u0456",
-            "\u0434\u0443\u0439\u0441\u0435\u043D\u0431\u0456",
-            "\u0441\u0435\u0439\u0441\u0435\u043D\u0431\u0456",
-            "\u0441\u04D9\u0440\u0435\u043D\u0431\u0456",
-            "\u0431\u0435\u0439\u0441\u0435\u043D\u0431\u0456",
-            "\u0436\u04B1\u043C\u0430",
-            "\u0441\u0435\u043D\u0431\u0456",
+        "\u0436\u0435\u043A\u0441\u0435\u043D\u0456",
+        "\u0434\u0443\u0439\u0441\u0435\u043D\u0431\u0456",
+        "\u0441\u0435\u0439\u0441\u0435\u043D\u0431\u0456",
+        "\u0441\u04D9\u0440\u0435\u043D\u0431\u0456",
+        "\u0431\u0435\u0439\u0441\u0435\u043D\u0431\u0456",
+        "\u0436\u04B1\u043C\u0430",
+        "\u0441\u0435\u043D\u0431\u0456",
     }
     MonthAbbreviations { 
-            "\u049B\u0430\u04A3.",
-            "\u0430\u049B\u043F.",
-            "\u043D\u0430\u0443.",
-            "\u0441\u04D9\u0443.",
-            "\u043C\u0430\u043C.",
-            "\u043C\u0430\u0443.",
-            "\u0448\u0456\u043B.",
-            "\u0442\u0430\u043C.",
-            "\u049B\u044B\u0440.",
-            "\u049B\u0430\u0437.",
-            "\u049B\u0430\u0440.",
-            "\u0436\u0435\u043B\u0442.",
-            "",
+        "\u049B\u0430\u04A3.",
+        "\u0430\u049B\u043F.",
+        "\u043D\u0430\u0443.",
+        "\u0441\u04D9\u0443.",
+        "\u043C\u0430\u043C.",
+        "\u043C\u0430\u0443.",
+        "\u0448\u0456\u043B.",
+        "\u0442\u0430\u043C.",
+        "\u049B\u044B\u0440.",
+        "\u049B\u0430\u0437.",
+        "\u049B\u0430\u0440.",
+        "\u0436\u0435\u043B\u0442.",
     }
     MonthNames { 
-            "\u049B\u0430\u04A3\u0442\u0430\u0440",
-            "\u0430\u049B\u043F\u0430\u043D",
-            "\u043D\u0430\u0443\u0440\u044B\u0437",
-            "\u0441\u04D9\u0443\u0456\u0440",
-            "\u043C\u0430\u043C\u044B\u0440",
-            "\u043C\u0430\u0443\u0441\u044B\u043C",
-            "\u0448\u0456\u043B\u0434\u0435",
-            "\u0442\u0430\u043C\u044B\u0437",
-            "\u049B\u044B\u0440\u043A\u04AF\u0439\u0435\u043A",
-            "\u049B\u0430\u0437\u0430\u043D",
-            "\u049B\u0430\u0440\u0430\u0448\u0430",
-            "\u0436\u0435\u043B\u0442\u043E\u049B\u0441\u0430\u043D",
-            "",
+        "\u049B\u0430\u04A3\u0442\u0430\u0440",
+        "\u0430\u049B\u043F\u0430\u043D",
+        "\u043D\u0430\u0443\u0440\u044B\u0437",
+        "\u0441\u04D9\u0443\u0456\u0440",
+        "\u043C\u0430\u043C\u044B\u0440",
+        "\u043C\u0430\u0443\u0441\u044B\u043C",
+        "\u0448\u0456\u043B\u0434\u0435",
+        "\u0442\u0430\u043C\u044B\u0437",
+        "\u049B\u044B\u0440\u043A\u04AF\u0439\u0435\u043A",
+        "\u049B\u0430\u0437\u0430\u043D",
+        "\u049B\u0430\u0440\u0430\u0448\u0430",
+        "\u0436\u0435\u043B\u0442\u043E\u049B\u0441\u0430\u043D",
     }
 
     NumberElements { 
-            ",",
-            "\u00A0",
-            ";",
-            "%",
-            "0",
-            "#",
-            "-",
-            "E",
-            "\u2030",
-            "\u221E",
-            "\uFFFD",
+        ",",
+        "\u00A0",
+        ";",
+        "%",
+        "0",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221E",
+        "\uFFFD",
     }
     LocaleScript{ "Cyrl" }
 
diff --git a/icu4c/source/data/locales/kk_KZ.txt b/icu4c/source/data/locales/kk_KZ.txt
index 1087a67dc2f..5f0532ac3c7 100644
--- a/icu4c/source/data/locales/kk_KZ.txt
+++ b/icu4c/source/data/locales/kk_KZ.txt
@@ -1,26 +1,27 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 kk_KZ {
-    LocaleID{ "043F"}
-    Version{ "x0.1" }
+    Version{ "x0.2" }
+    LocaleID:int { 0x043F }
     CurrencyElements { 
-            "\u0442\u04A3\u0433.",
-            "KZT",
-            ",",
+        "\u0442\u04A3\u0433.",
+        "KZT",
+        ",",
     }
     NumberPatterns { 
-            "#,##0.###;-#,##0.###",
-            "#,##0.00 \u00A4;-\u00A4 #,##0.00",
-            "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "#,##0.00 \u00A4;-\u00A4 #,##0.00",
+        "#,##0%",
+        "#E0",
     }
     DateTimeElements{
-  	"0",
-  	"1"
+  	    "0",
+  	    "1"
     }
 
 }
diff --git a/icu4c/source/data/locales/kn.txt b/icu4c/source/data/locales/kn.txt
index 048a518ab13..9a99a46f3b6 100644
--- a/icu4c/source/data/locales/kn.txt
+++ b/icu4c/source/data/locales/kn.txt
@@ -1,94 +1,92 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 kn {
- LocaleID{ "4B"}
- Version{ "x0.1" }
- AmPmMarkers{
-  "\u0CAA\u0CC2\u0CB0\u0CCD\u0CB5\u0CBE\u0CB9\u0CCD\u0CA8",
-  "\u0C85\u0CAA\u0CB0\u0CBE\u0CB9\u0CCD\u0CA8"
- }
- ShortLanguage{
-  "KAN"
- }
- Language{
-  "Kannada"
- }
-
-  DayNames{
-  "\u0CB0\u0CB5\u0CBF\u0CB5\u0CBE\u0CB0",
-  "\u0CB8\u0CCB\u0CAE\u0CB5\u0CBE\u0CB0",
-  "\u0CAE\u0C82\u0C97\u0CB3\u0CB5\u0CBE\u0CB0",
-  "\u0CAC\u0CC1\u0CA7\u0CB5\u0CBE\u0CB0",
-  "\u0C97\u0CC1\u0CB0\u0CC1\u0CB5\u0CBE\u0CB0",
-  "\u0CB6\u0CC1\u0C95\u0CCD\u0CB0\u0CB5\u0CBE\u0CB0",
-  "\u0CB6\u0CA8\u0CBF\u0CB5\u0CBE\u0CB0"
- }
-
- DayAbbreviations{
-  "\u0CB0.",
-  "\u0CB8\u0CCB.",
-  "\u0CAE\u0C82.",
-  "\u0CAC\u0CC1.",
-  "\u0C97\u0CC1.",
-  "\u0CB6\u0CC1.",
-  "\u0CB6\u0CA8\u0CBF."
- }
-
- MonthNames{
-  "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0",
-  "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0",
-  "\u0CAE\u0CBE\u0CB0\u0CCD\u0C9A\u0CCD",
-  "\u0C8E\u0CAA\u0CCD\u0CB0\u0CBF\u0CB2\u0CCD",
-  "\u0CAE\u0CC6",
-  "\u0C9C\u0CC2\u0CA8\u0CCD",
-  "\u0C9C\u0CC1\u0CB2\u0CC8",
-  "\u0C86\u0C97\u0CB8\u0CCD\u0C9F\u0CCD",
-  "\u0CB8\u0CAA\u0CCD\u0C9F\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
-  "\u0C85\u0C95\u0CCD\u0C9F\u0CCB\u0CAC\u0CB0\u0CCD",
-  "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
-  "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
-  ""
- }
-
- MonthAbbreviations{
-  "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0",
-  "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0",
-  "\u0CAE\u0CBE\u0CB0\u0CCD\u0C9A\u0CCD",
-  "\u0C8E\u0CAA\u0CCD\u0CB0\u0CBF\u0CB2\u0CCD",
-  "\u0CAE\u0CC6",
-  "\u0C9C\u0CC2\u0CA8\u0CCD",
-  "\u0C9C\u0CC1\u0CB2\u0CC8",
-  "\u0C86\u0C97\u0CB8\u0CCD\u0C9F\u0CCD",
-  "\u0CB8\u0CAA\u0CCD\u0C9F\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
-  "\u0C85\u0C95\u0CCD\u0C9F\u0CCB\u0CAC\u0CB0\u0CCD",
-  "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
-  "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
-  ""
- }
-
- NumberElements{
-  ".",
-  ",",
-  ",",
-  "%",
-  ",",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Knda" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.2" }
+    LocaleID:int { 0x4B }
+    AmPmMarkers{
+        "\u0CAA\u0CC2\u0CB0\u0CCD\u0CB5\u0CBE\u0CB9\u0CCD\u0CA8",
+        "\u0C85\u0CAA\u0CB0\u0CBE\u0CB9\u0CCD\u0CA8"
+    }
+//    ShortLanguage{
+//        "KAN"
+//    }
+//    Language {
+//        "Kannada"
+//    }
+
+    DayNames{
+        "\u0CB0\u0CB5\u0CBF\u0CB5\u0CBE\u0CB0",
+        "\u0CB8\u0CCB\u0CAE\u0CB5\u0CBE\u0CB0",
+        "\u0CAE\u0C82\u0C97\u0CB3\u0CB5\u0CBE\u0CB0",
+        "\u0CAC\u0CC1\u0CA7\u0CB5\u0CBE\u0CB0",
+        "\u0C97\u0CC1\u0CB0\u0CC1\u0CB5\u0CBE\u0CB0",
+        "\u0CB6\u0CC1\u0C95\u0CCD\u0CB0\u0CB5\u0CBE\u0CB0",
+        "\u0CB6\u0CA8\u0CBF\u0CB5\u0CBE\u0CB0"
+    }
+
+    DayAbbreviations{
+        "\u0CB0.",
+        "\u0CB8\u0CCB.",
+        "\u0CAE\u0C82.",
+        "\u0CAC\u0CC1.",
+        "\u0C97\u0CC1.",
+        "\u0CB6\u0CC1.",
+        "\u0CB6\u0CA8\u0CBF."
+    }
+
+    MonthNames{
+        "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0",
+        "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0",
+        "\u0CAE\u0CBE\u0CB0\u0CCD\u0C9A\u0CCD",
+        "\u0C8E\u0CAA\u0CCD\u0CB0\u0CBF\u0CB2\u0CCD",
+        "\u0CAE\u0CC6",
+        "\u0C9C\u0CC2\u0CA8\u0CCD",
+        "\u0C9C\u0CC1\u0CB2\u0CC8",
+        "\u0C86\u0C97\u0CB8\u0CCD\u0C9F\u0CCD",
+        "\u0CB8\u0CAA\u0CCD\u0C9F\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
+        "\u0C85\u0C95\u0CCD\u0C9F\u0CCB\u0CAC\u0CB0\u0CCD",
+        "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
+        "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
+    }
+
+    MonthAbbreviations{
+        "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0",
+        "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0",
+        "\u0CAE\u0CBE\u0CB0\u0CCD\u0C9A\u0CCD",
+        "\u0C8E\u0CAA\u0CCD\u0CB0\u0CBF\u0CB2\u0CCD",
+        "\u0CAE\u0CC6",
+        "\u0C9C\u0CC2\u0CA8\u0CCD",
+        "\u0C9C\u0CC1\u0CB2\u0CC8",
+        "\u0C86\u0C97\u0CB8\u0CCD\u0C9F\u0CCD",
+        "\u0CB8\u0CAA\u0CCD\u0C9F\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
+        "\u0C85\u0C95\u0CCD\u0C9F\u0CCB\u0CAC\u0CB0\u0CCD",
+        "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
+        "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
+    }
+
+    NumberElements{
+        ".",
+        ",",
+        ",",
+        "%",
+        ",",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript:array { "Knda" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/kn_IN.txt b/icu4c/source/data/locales/kn_IN.txt
index 122f0e8d118..5aa2b58fd7f 100644
--- a/icu4c/source/data/locales/kn_IN.txt
+++ b/icu4c/source/data/locales/kn_IN.txt
@@ -7,7 +7,7 @@
 
 kn_IN {
     Version { "x0.2" }
-    LocaleID{ "044B"}
+    LocaleID:int { 0x044B }
 //    ShortCountry { IND }
 
     CurrencyElements {
diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt
index 13f4db362be..03f253362c9 100644
--- a/icu4c/source/data/locales/ko.txt
+++ b/icu4c/source/data/locales/ko.txt
@@ -2193,7 +2193,7 @@ ko {
         za { "\uc8fc\uc559\uc5b4" }
         zu { "\uc904\ub8e8\uc5b4" }
     }
-    LocaleID { "12" }
+    LocaleID:int { 0x12 }
 //    LocaleString { "ko" }
     MonthAbbreviations { 
         "1\uC6D4",
diff --git a/icu4c/source/data/locales/ko_KR.txt b/icu4c/source/data/locales/ko_KR.txt
index 42bb7a29d44..3650253704a 100644
--- a/icu4c/source/data/locales/ko_KR.txt
+++ b/icu4c/source/data/locales/ko_KR.txt
@@ -20,7 +20,7 @@ ko_KR {
         "#E0",
     }
 //    ShortCountry { "KOR" }
-    LocaleID { "0412" }
+    LocaleID:int { 0x0412 }
     Countries {
         //KR { "\uB300\uD55C\uBBFC\uAD6D" }
         KP { "\uC870\uC120 \uBBFC\uC8FC\uC8FC\uC758 \uC778\uBBFC \uACF5\uD654\uAD6D" }
diff --git a/icu4c/source/data/locales/kok.txt b/icu4c/source/data/locales/kok.txt
index a732a737b45..96621539c1d 100644
--- a/icu4c/source/data/locales/kok.txt
+++ b/icu4c/source/data/locales/kok.txt
@@ -6,8 +6,8 @@
 // ***************************************************************************
 
 kok {
-    LocaleID { "57" }
     Version { "1.0" }
+    LocaleID:int { 0x57 }
 //    ShortLanguage { kok }
     Languages {
         root { "\u0915\u094b\u0902\u0915\u0923\u0940" }  /* Konkani translation? */
diff --git a/icu4c/source/data/locales/kok_IN.txt b/icu4c/source/data/locales/kok_IN.txt
index 200ad0e5ad7..706f6ab181d 100644
--- a/icu4c/source/data/locales/kok_IN.txt
+++ b/icu4c/source/data/locales/kok_IN.txt
@@ -8,7 +8,7 @@
 
 kok_IN {
     Version { "1.1.1" }
-    LocaleID { "0457" }
+    LocaleID:int { 0x0457 }
 //    ShortCountry { IND }
 
     CurrencyElements {
diff --git a/icu4c/source/data/locales/ky.txt b/icu4c/source/data/locales/ky.txt
index c0c14a69146..0f2adf1fffc 100644
--- a/icu4c/source/data/locales/ky.txt
+++ b/icu4c/source/data/locales/ky.txt
@@ -1,86 +1,84 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 ky{
- Version{ "x0.1" }
- LocaleID{ "40"}
- ShortLanguage{
-  "KYR"
- }
- DayNames{
-  "\u0416\u0435\u043A\u0448\u0435\u043C\u0431\u0438",
-  "\u0414\u04AF\u0439\u0448\u04E9\u043C\u0431\u04AF",
-  "\u0428\u0435\u0439\u0448\u0435\u043C\u0431\u0438",
-  "\u0428\u0430\u0440\u0448\u0435\u043C\u0431\u0438",
-  "\u0411\u0435\u0439\u0448\u0435\u043C\u0431\u0438",
-  "\u0416\u0443\u043C\u0430",
-  "\u0418\u0448\u0435\u043C\u0431\u0438"
- }
-
- DayAbbreviations{
-  "\u0416\u0448",
-  "\u0414\u0448",
-  "\u0428\u0448",
-  "\u0428\u0440",
-  "\u0411\u0448",
-  "\u0416\u043C",
-  "\u0418\u0448"
- }
-
- MonthNames{
-  "\u042F\u043D\u0432\u0430\u0440\u044C",
-  "\u0424\u0435\u0432\u0440\u0430\u043B\u044C",
-  "\u041C\u0430\u0440\u0442",
-  "\u0410\u043F\u0440\u0435\u043B\u044C",
-  "\u041C\u0430\u0439",
-  "\u0418\u044E\u043D\u044C",
-  "\u0418\u044E\u043B\u044C",
-  "\u0410\u0432\u0433\u0443\u0441\u0442",
-  "\u0421\u0435\u043D\u0442\u044F\u0431\u0440\u044C",
-  "\u041E\u043A\u0442\u044F\u0431\u0440\u044C",
-  "\u041D\u043E\u044F\u0431\u0440\u044C",
-  "\u0414\u0435\u043A\u0430\u0431\u0440\u044C",
-  ""
- }
-
- MonthAbbreviations{
-  "\u042F\u043D\u0432",
-  "\u0424\u0435\u0432",
-  "\u041C\u0430\u0440",
-  "\u0410\u043F\u0440",
-  "\u041C\u0430\u0439",
-  "\u0418\u044E\u043D",
-  "\u0418\u044E\u043B",
-  "\u0410\u0432\u0433",
-  "\u0421\u0435\u043D",
-  "\u041E\u043A\u0442",
-  "\u041D\u043E\u044F",
-  "\u0414\u0435\u043A",
-  ""
- }
-
- NumberElements{
-  ",",
-  "\u00A0",
-  ";",
-  "%",
-  ";",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Goer" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.1" }
+    LocaleID:int { 0x40 }
+//    ShortLanguage{
+//        "KYR"
+//    }
+    DayNames{
+        "\u0416\u0435\u043A\u0448\u0435\u043C\u0431\u0438",
+        "\u0414\u04AF\u0439\u0448\u04E9\u043C\u0431\u04AF",
+        "\u0428\u0435\u0439\u0448\u0435\u043C\u0431\u0438",
+        "\u0428\u0430\u0440\u0448\u0435\u043C\u0431\u0438",
+        "\u0411\u0435\u0439\u0448\u0435\u043C\u0431\u0438",
+        "\u0416\u0443\u043C\u0430",
+        "\u0418\u0448\u0435\u043C\u0431\u0438"
+    }
+
+    DayAbbreviations{
+        "\u0416\u0448",
+        "\u0414\u0448",
+        "\u0428\u0448",
+        "\u0428\u0440",
+        "\u0411\u0448",
+        "\u0416\u043C",
+        "\u0418\u0448"
+    }
+
+    MonthNames{
+        "\u042F\u043D\u0432\u0430\u0440\u044C",
+        "\u0424\u0435\u0432\u0440\u0430\u043B\u044C",
+        "\u041C\u0430\u0440\u0442",
+        "\u0410\u043F\u0440\u0435\u043B\u044C",
+        "\u041C\u0430\u0439",
+        "\u0418\u044E\u043D\u044C",
+        "\u0418\u044E\u043B\u044C",
+        "\u0410\u0432\u0433\u0443\u0441\u0442",
+        "\u0421\u0435\u043D\u0442\u044F\u0431\u0440\u044C",
+        "\u041E\u043A\u0442\u044F\u0431\u0440\u044C",
+        "\u041D\u043E\u044F\u0431\u0440\u044C",
+        "\u0414\u0435\u043A\u0430\u0431\u0440\u044C",
+    }
+
+    MonthAbbreviations{
+        "\u042F\u043D\u0432",
+        "\u0424\u0435\u0432",
+        "\u041C\u0430\u0440",
+        "\u0410\u043F\u0440",
+        "\u041C\u0430\u0439",
+        "\u0418\u044E\u043D",
+        "\u0418\u044E\u043B",
+        "\u0410\u0432\u0433",
+        "\u0421\u0435\u043D",
+        "\u041E\u043A\u0442",
+        "\u041D\u043E\u044F",
+        "\u0414\u0435\u043A",
+    }
+
+    NumberElements{
+        ",",
+        "\u00A0",
+        ";",
+        "%",
+        ";",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript:array{ "Goer" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/ky_KG.txt b/icu4c/source/data/locales/ky_KG.txt
index ab664fc6ee1..d612b7c8b9f 100644
--- a/icu4c/source/data/locales/ky_KG.txt
+++ b/icu4c/source/data/locales/ky_KG.txt
@@ -1,30 +1,30 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 ky_KG{
- LocaleID{ "0440"}
- Version{ "x0.1" }
- CurrencyElements{
-  "\u0441\u043E\u043C",
-  "KGS",
-  "-"
- }
- ShortCountry{
-  "KGZ"
- }
- DateTimePatterns{
-  "h:mm:ss aa",
-  "H:mm:ss",
-  "H:mm:ss",
-  "H:mm:ss",
-  "d'-'MMMM yyyy'-\u0436.'",
-  "d'-'MMMM yyyy'-\u0436.',EEEE",
-  "dd.MM.yyyy",
-  "dd.MM.yy",
-  "{1} {0}",
- }
+    Version{ "x0.2" }
+    LocaleID:int { 0x0440 }
+    CurrencyElements{
+        "\u0441\u043E\u043C",
+        "KGS",
+        "-"
+    }
+//    ShortCountry{
+//        "KGZ"
+//    }
+    DateTimePatterns{
+        "h:mm:ss aa",
+        "H:mm:ss",
+        "H:mm:ss",
+        "H:mm:ss",
+        "d'-'MMMM yyyy'-\u0436.'",
+        "d'-'MMMM yyyy'-\u0436.',EEEE",
+        "dd.MM.yyyy",
+        "dd.MM.yy",
+        "{1} {0}",
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt
index 041a60b077a..b0e8228767b 100644
--- a/icu4c/source/data/locales/lt.txt
+++ b/icu4c/source/data/locales/lt.txt
@@ -52,7 +52,7 @@ lt {
     Languages { 
         lt { "Lietuvi\u0159" }
     }
-    LocaleID { "27" }
+    LocaleID:int { 0x27 }
 //    LocaleString { "lt" }
     MonthAbbreviations { 
         "Sau",
diff --git a/icu4c/source/data/locales/lt_LT.txt b/icu4c/source/data/locales/lt_LT.txt
index 8cf458e4311..c8092472026 100644
--- a/icu4c/source/data/locales/lt_LT.txt
+++ b/icu4c/source/data/locales/lt_LT.txt
@@ -20,5 +20,5 @@ lt_LT {
         "#E0",
     }
 //    ShortCountry { "LTU" }
-    LocaleID { "0427" }
+    LocaleID:int { 0x0427 }
 }
diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt
index 2f1828d15a5..4e9e148db37 100644
--- a/icu4c/source/data/locales/lv.txt
+++ b/icu4c/source/data/locales/lv.txt
@@ -52,7 +52,7 @@ lv {
     Languages { 
         lv { "Latvie\u0161u" }
     }
-    LocaleID { "26" }
+    LocaleID:int { 0x26 }
 //    LocaleString { "lv" }
     MonthAbbreviations { 
         "Jan",
diff --git a/icu4c/source/data/locales/lv_LV.txt b/icu4c/source/data/locales/lv_LV.txt
index 05a11654e63..0001e25c373 100644
--- a/icu4c/source/data/locales/lv_LV.txt
+++ b/icu4c/source/data/locales/lv_LV.txt
@@ -20,5 +20,5 @@ lv_LV {
         "#E0",
     }
 //    ShortCountry { "LVA" }
-    LocaleID { "0426" }
+    LocaleID:int { 0x0426 }
 }
diff --git a/icu4c/source/data/locales/mk.txt b/icu4c/source/data/locales/mk.txt
index 6060e8bb778..3aad9665870 100644
--- a/icu4c/source/data/locales/mk.txt
+++ b/icu4c/source/data/locales/mk.txt
@@ -82,7 +82,7 @@ mk {
     Languages { 
         mk { "\u043C\u0430\u043A\u0435\u0434\u043E\u034D\u0441\u043A\u0438" }
     }
-    LocaleID { "2f" }
+    LocaleID:int { 0x2f }
 //    LocaleString { "mk" }
     MonthAbbreviations { 
         "\u0458\u0430\u043D.",
diff --git a/icu4c/source/data/locales/mk_MK.txt b/icu4c/source/data/locales/mk_MK.txt
index 210334d718d..cb40170da8f 100644
--- a/icu4c/source/data/locales/mk_MK.txt
+++ b/icu4c/source/data/locales/mk_MK.txt
@@ -20,5 +20,5 @@ mk_MK {
         "#E0",
     }
 //    ShortCountry { "MKD" }
-    LocaleID { "042f" }
+    LocaleID:int { 0x042f }
 }
diff --git a/icu4c/source/data/locales/mn.txt b/icu4c/source/data/locales/mn.txt
index 7b028f72b6f..b946fc5a4af 100644
--- a/icu4c/source/data/locales/mn.txt
+++ b/icu4c/source/data/locales/mn.txt
@@ -1,86 +1,84 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 mn{
- Version{ "x0.1" }
- LocaleID{ "50"}
- ShortLanguage{
-  "MON"
- }
- DayNames{
-  "\u041D\u044F\u043C",
-  "\u0414\u0430\u0432\u0430\u0430",
-  "\u041C\u044F\u0433\u043C\u0430\u0440",
-  "\u041B\u0445\u0430\u0433\u0432\u0430",
-  "\u041F\u04AF\u0440\u044D\u0432",
-  "\u0411\u0430\u0430\u0441\u0430\u043D",
-  "\u0411\u044F\u043C\u0431\u0430"
- }
-
- DayAbbreviations{
-  "\u041D\u044F",
-  "\u0414\u0430",
-  "\u041C\u044F",
-  "\u041B\u0445",
-  "\u041F\u04AF",
-  "\u0411\u0430",
-  "\u0411\u044F"
- }
-
- MonthNames{
-  "1\u00A0\u0434\u04AF\u0433\u044D\u044D\u0440\u00A0\u0441\u0430\u0440",
-  "2\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
-  "3\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
-  "4\u00A0\u0434\u04AF\u0433\u044D\u044D\u0440\u00A0\u0441\u0430\u0440",
-  "5\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
-  "6\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
-  "7\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
-  "8\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
-  "9\u00A0\u0434\u04AF\u0433\u044D\u044D\u0440\u00A0\u0441\u0430\u0440",
-  "10\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
-  "11\u00A0\u0434\u04AF\u0433\u044D\u044D\u0440\u00A0\u0441\u0430\u0440",
-  "12\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
-  ""
- }
-
- MonthAbbreviations{
-  "I",
-  "II",
-  "III",
-  "IV",
-  "V",
-  "VI",
-  "VII",
-  "V\u0428",
-  "IX",
-  "X",
-  "XI",
-  "XII",
-  ""
- }
-
- NumberElements{
-  ",",
-  "\u00A0",
-  ";",
-  "%",
-  ";",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Cyrl" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.2" }
+    LocaleID:int { 0x50 }
+// ShortLanguage{
+//  "MON"
+// }
+    DayNames{
+        "\u041D\u044F\u043C",
+        "\u0414\u0430\u0432\u0430\u0430",
+        "\u041C\u044F\u0433\u043C\u0430\u0440",
+        "\u041B\u0445\u0430\u0433\u0432\u0430",
+        "\u041F\u04AF\u0440\u044D\u0432",
+        "\u0411\u0430\u0430\u0441\u0430\u043D",
+        "\u0411\u044F\u043C\u0431\u0430"
+    }
+
+    DayAbbreviations{
+        "\u041D\u044F",
+        "\u0414\u0430",
+        "\u041C\u044F",
+        "\u041B\u0445",
+        "\u041F\u04AF",
+        "\u0411\u0430",
+        "\u0411\u044F"
+    }
+
+    MonthNames{
+        "1\u00A0\u0434\u04AF\u0433\u044D\u044D\u0440\u00A0\u0441\u0430\u0440",
+        "2\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
+        "3\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
+        "4\u00A0\u0434\u04AF\u0433\u044D\u044D\u0440\u00A0\u0441\u0430\u0440",
+        "5\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
+        "6\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
+        "7\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
+        "8\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
+        "9\u00A0\u0434\u04AF\u0433\u044D\u044D\u0440\u00A0\u0441\u0430\u0440",
+        "10\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
+        "11\u00A0\u0434\u04AF\u0433\u044D\u044D\u0440\u00A0\u0441\u0430\u0440",
+        "12\u00A0\u0434\u0443\u0433\u0430\u0430\u0440\u00A0\u0441\u0430\u0440",
+    }
+
+    MonthAbbreviations{
+        "I",
+        "II",
+        "III",
+        "IV",
+        "V",
+        "VI",
+        "VII",
+        "V\u0428",
+        "IX",
+        "X",
+        "XI",
+        "XII",
+    }
+
+    NumberElements{
+        ",",
+        "\u00A0",
+        ";",
+        "%",
+        ";",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript{ "Cyrl" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/mn_MN.txt b/icu4c/source/data/locales/mn_MN.txt
index e21b5d275f9..a7320139a68 100644
--- a/icu4c/source/data/locales/mn_MN.txt
+++ b/icu4c/source/data/locales/mn_MN.txt
@@ -1,31 +1,31 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 mn_MN{
- Version{ "x0.1" }
- LocaleID{ "0450"}
- ShortCountry{
-  "MNG"
- }
- CurrencyElements{
-  "\u20AE",
-  "MNT",
-  ","
- }
+    Version{ "x0.1" }
+    LocaleID:int { 0x0450 }
+//    ShortCountry{
+//        "MNG"
+//    }
+    CurrencyElements{
+        "\u20AE",
+        "MNT",
+        ","
+    }
 
- DateTimePatterns{
-  "h:mm:ss aa",
-  "H:mm:ss",
-  "H:mm:ss",
-  "H:mm:ss",
-  "yyyy '\u043E\u043D\u044B' MMMM d",
-  "yyyy '\u043E\u043D\u044B' MMMM d",
-  "yyyy.MM.dd",
-  "yy.MM.dd",
-  "{1} {0}",
- }
+    DateTimePatterns{
+        "h:mm:ss aa",
+        "H:mm:ss",
+        "H:mm:ss",
+        "H:mm:ss",
+        "yyyy '\u043E\u043D\u044B' MMMM d",
+        "yyyy '\u043E\u043D\u044B' MMMM d",
+        "yyyy.MM.dd",
+        "yy.MM.dd",
+        "{1} {0}",
+    }
 }
diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt
index 4cf4a09d276..08734791829 100644
--- a/icu4c/source/data/locales/mr.txt
+++ b/icu4c/source/data/locales/mr.txt
@@ -236,7 +236,7 @@ mr {
         }
     }
 
-    LocaleID { "4e" }
+    LocaleID:int { 0x4e }
     CollationElements {
         Version { "1.0" }
         Sequence { 
diff --git a/icu4c/source/data/locales/mr_IN.txt b/icu4c/source/data/locales/mr_IN.txt
index 6515a067f9c..7245a2459b9 100644
--- a/icu4c/source/data/locales/mr_IN.txt
+++ b/icu4c/source/data/locales/mr_IN.txt
@@ -8,7 +8,7 @@
 
 mr_IN {
     Version { "1.2" }
-    LocaleID { "044e" }
+    LocaleID:int { 0x044e }
 //    ShortCountry { IND }
 
     CurrencyElements {
diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt
index c1f889d0f1b..7756194f5f1 100644
--- a/icu4c/source/data/locales/ms.txt
+++ b/icu4c/source/data/locales/ms.txt
@@ -1,63 +1,61 @@
-//*******************************************************************************
-//*
-//*   Copyright (C) 2001-2003, International Business Machines
-//*   Corporation and others.  All Rights Reserved.
-//*   Generated from Universal Locales for Linux Project
-//*******************************************************************************
+// ***************************************************************************
+// *
+// *   Copyright (C) 2001-2002, International Business Machines
+// *   Corporation and others.  All Rights Reserved.
+// *   Generated from Universal Locales for Linux Project
+// ***************************************************************************
 
 ms{
-   Version{ "x1.0" }
+    Version{ "x1.0" }
     DayAbbreviations { 
-            "Aha",
-            "Isn",
-            "Sei",
-            "Rab",
-            "Kha",
-            "Jum",
-            "Sab",
+        "Aha",
+        "Isn",
+        "Sei",
+        "Rab",
+        "Kha",
+        "Jum",
+        "Sab",
     }
     DayNames { 
-            "Ahad",
-            "Isnin",
-            "Selasa",
-            "Rahu",
-            "Khamis",
-            "Jumaat",
-            "Sabtu",
+        "Ahad",
+        "Isnin",
+        "Selasa",
+        "Rahu",
+        "Khamis",
+        "Jumaat",
+        "Sabtu",
     }
     MonthAbbreviations { 
-            "Jan",
-            "Feb",
-            "Mac",
-            "Apr",
-            "Mei",
-            "Jun",
-            "Jul",
-            "Ogos",
-            "Sep",
-            "Okt",
-            "Nov",
-            "Dis",
-            "",
+        "Jan",
+        "Feb",
+        "Mac",
+        "Apr",
+        "Mei",
+        "Jun",
+        "Jul",
+        "Ogos",
+        "Sep",
+        "Okt",
+        "Nov",
+        "Dis",
     }
     MonthNames { 
-            "Januari",
-            "Februari",
-            "Mac",
-            "April",
-            "Mei",
-            "Jun",
-            "Julai",
-            "Ogos",
-            "September",
-            "Oktober",
-            "November",
-            "Disember",
-            "",
+        "Januari",
+        "Februari",
+        "Mac",
+        "April",
+        "Mei",
+        "Jun",
+        "Julai",
+        "Ogos",
+        "September",
+        "Oktober",
+        "November",
+        "Disember",
     }
-    LocaleID {"3e"}
-    LocaleString{ "ms" }
+    LocaleID:int { 0x3e }
+//    LocaleString{ "ms" }
     LocaleScript{ 
-                "Latn",  // ISO 15924 Name 
+        "Latn",  // ISO 15924 Name 
     }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/ms_BN.txt b/icu4c/source/data/locales/ms_BN.txt
index 197f2f84c11..9510e75d6e1 100644
--- a/icu4c/source/data/locales/ms_BN.txt
+++ b/icu4c/source/data/locales/ms_BN.txt
@@ -1,29 +1,30 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 ms_BN{
- Version{ "x0.1" }
- CurrencyElements{
-  "$",
-  "BND",
-  ","
- }
- ShortCountry{
-  "BRN"
- }
- DateTimePatterns{
-  "h:mm:ss aa",
-  "H:mm:ss",
-  "H:mm:ss",
-  "H:mm:ss",
-  "dd MMMM yyyy",
-  "dd MMMM yyyy",
-  "dd/MM/yyyy",
-  "dd/MM/yyyy",
-  "{1} {0}",
- }
+    Version{ "x0.2" }
+    LocaleID:int { 0x083e }
+    CurrencyElements{
+        "$",
+        "BND",
+        ","
+    }
+// ShortCountry{
+//  "BRN"
+// }
+    DateTimePatterns{
+        "h:mm:ss aa",
+        "H:mm:ss",
+        "H:mm:ss",
+        "H:mm:ss",
+        "dd MMMM yyyy",
+        "dd MMMM yyyy",
+        "dd/MM/yyyy",
+        "dd/MM/yyyy",
+        "{1} {0}",
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/ms_MY.txt b/icu4c/source/data/locales/ms_MY.txt
index 4533b821377..f9eb82ced7d 100644
--- a/icu4c/source/data/locales/ms_MY.txt
+++ b/icu4c/source/data/locales/ms_MY.txt
@@ -1,47 +1,48 @@
-//*******************************************************************************
-//*
-//*   Copyright (C) 2001-2003, International Business Machines
-//*   Corporation and others.  All Rights Reserved.
-//*   Generated from Universal Locales for Linux Project
-//*******************************************************************************
+// ***************************************************************************
+// *
+// *   Copyright (C) 2001-2003, International Business Machines
+// *   Corporation and others.  All Rights Reserved.
+// *   Generated from Universal Locales for Linux Project
+// ***************************************************************************
 
 ms_MY {
-   Version{ "x1.0" }
+    Version{ "x1.0" }
     CurrencyElements { 
-            "R",
-            "MYR",
-            ".",
+        "R",
+        "MYR",
+        ".",
     }
     DateTimePatterns { 
-            "hh:mm:ss aa z",
-            "hh:mm:ss  z",
-            "hh:mm:ss  z",
-            "hh:mm:ss  z",
-            "EEEE dd MMM yyyy",
-            "EEEE dd MMM yyyy",
-            "EEEE dd MMM yyyy",
-            "EEEE dd MMM yyyy",
-            "{1} {0}",
+        "hh:mm:ss aa z",
+        "hh:mm:ss  z",
+        "hh:mm:ss  z",
+        "hh:mm:ss  z",
+        "EEEE dd MMM yyyy",
+        "EEEE dd MMM yyyy",
+        "EEEE dd MMM yyyy",
+        "EEEE dd MMM yyyy",
+        "{1} {0}",
     }
 
     NumberElements { 
-            ".",
-            ",",
-            ";",
-            "%",
-            "0",
-            "#",
-            "-",
-            "E",
-            "\u2030",
-            "\u221E",
-            "\uFFFD",
+        ".",
+        ",",
+        ";",
+        "%",
+        "0",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221E",
+        "\uFFFD",
     }
     NumberPatterns { 
-            "#,##0.###;-#,##0.###",
-            "\u00A4#,##0.00;(\u00A4#,##0.00)",
-            "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "\u00A4#,##0.00;(\u00A4#,##0.00)",
+        "#,##0%",
+        "#E0",
     }
-    LocaleID {"043e"}
-    LocaleString{ "ms_MY" }
+    LocaleID:int { 0x043e }
+//    LocaleString{ "ms_MY" }
 }
diff --git a/icu4c/source/data/locales/mt.txt b/icu4c/source/data/locales/mt.txt
index 05ff604d62a..dd9174b0af2 100644
--- a/icu4c/source/data/locales/mt.txt
+++ b/icu4c/source/data/locales/mt.txt
@@ -798,7 +798,7 @@ mt {
         }
     }
 
-    LocaleID {"3A"}
+    LocaleID:int { 0x3A }
 //    LocaleScript{ 
 //        "Latn",  // ISO 15924 Name 
 //    }
diff --git a/icu4c/source/data/locales/mt_MT.txt b/icu4c/source/data/locales/mt_MT.txt
index e541cd8faae..9d1ea80ff6d 100644
--- a/icu4c/source/data/locales/mt_MT.txt
+++ b/icu4c/source/data/locales/mt_MT.txt
@@ -26,6 +26,6 @@ mt_MT {
         "#E0",
     }
 
-    LocaleID {"043A"}
+    LocaleID:int { 0x043A }
 
 }
diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt
index 49ca48c4eee..e0f917b6eb6 100644
--- a/icu4c/source/data/locales/nb.txt
+++ b/icu4c/source/data/locales/nb.txt
@@ -54,7 +54,7 @@ nb {
         nn { "nynorsk" }
         no { "norsk" }
     }
-    LocaleID { "14" }
+    LocaleID:int { 0x14 }
 //    LocaleString { "nb" }
     MonthAbbreviations {
 	    "jan",
diff --git a/icu4c/source/data/locales/nb_NO.txt b/icu4c/source/data/locales/nb_NO.txt
index e11b7844510..f7a85c1857a 100644
--- a/icu4c/source/data/locales/nb_NO.txt
+++ b/icu4c/source/data/locales/nb_NO.txt
@@ -19,5 +19,5 @@ nb_NO {
         "#E0",
     }
 //    ShortCountry { "NOR" }
-    LocaleID { "0414" }
+    LocaleID:int { 0x0414 }
 }
diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt
index ad0e9cbfa61..4a0bbe4d586 100644
--- a/icu4c/source/data/locales/nl.txt
+++ b/icu4c/source/data/locales/nl.txt
@@ -47,7 +47,7 @@ nl {
     Languages { 
         nl { "Nederlands" }
     }
-    LocaleID { "13" }
+    LocaleID:int { 0x13 }
 //    LocaleString { "nl" }
     MonthAbbreviations { 
         "jan",
diff --git a/icu4c/source/data/locales/nl_BE.txt b/icu4c/source/data/locales/nl_BE.txt
index cb19ab3007c..e17908c3781 100644
--- a/icu4c/source/data/locales/nl_BE.txt
+++ b/icu4c/source/data/locales/nl_BE.txt
@@ -27,7 +27,7 @@ nl_BE {
         "d/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "0813" }
+    LocaleID:int { 0x0813 }
 //    LocaleString { "nl_BE" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
diff --git a/icu4c/source/data/locales/nl_NL.txt b/icu4c/source/data/locales/nl_NL.txt
index bf895302826..eeb66d8e399 100644
--- a/icu4c/source/data/locales/nl_NL.txt
+++ b/icu4c/source/data/locales/nl_NL.txt
@@ -20,5 +20,5 @@ nl_NL {
         "#E0",
     }
 //    ShortCountry { "NLD" }
-    LocaleID { "0413" }
+    LocaleID:int { 0x0413 }
 }
diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt
index e802fc4f019..0c5ef205a30 100644
--- a/icu4c/source/data/locales/nn.txt
+++ b/icu4c/source/data/locales/nn.txt
@@ -113,7 +113,7 @@ nn{
         "laurdag",
     }
 
-    LocaleID { "814" }
+    LocaleID:int { 0x814 }
 //    LocaleScript{ 
 //        "Latn",  // ISO 15924 Name 
 //    }
diff --git a/icu4c/source/data/locales/nn_NO.txt b/icu4c/source/data/locales/nn_NO.txt
index 6de25b83220..a65d54af436 100644
--- a/icu4c/source/data/locales/nn_NO.txt
+++ b/icu4c/source/data/locales/nn_NO.txt
@@ -20,5 +20,5 @@ nn_NO {
         "#E0",
     }
 //    ShortCountry { "NOR" }
-    LocaleID { "0814" }
+    LocaleID:int { 0x0814 }
 }
diff --git a/icu4c/source/data/locales/pa.txt b/icu4c/source/data/locales/pa.txt
index 62457af5912..1505b76b49a 100644
--- a/icu4c/source/data/locales/pa.txt
+++ b/icu4c/source/data/locales/pa.txt
@@ -1,95 +1,95 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 pa {
- LocaleID{ "46"}
- AmPmMarkers{
-  "\u0A38\u0A35\u0A47\u0A30\u0A47",
-  "\u0A36\u0A3E\u0A2E"
- }
- ShortLanguage{
-  "PAN"
- }
- DayNames{
-  "\u0A10\u0A24\u0A35\u0A3E\u0A30",
-  "\u0A38\u0A4B\u0A2E\u0A35\u0A3E\u0A30",
-  "\u0A2E\u0A70\u0A17\u0A32\u0A35\u0A3E\u0A30",
-  "\u0A2C\u0A41\u0A27\u0A35\u0A3E\u0A30",
-  "\u0A35\u0A40\u0A30\u0A35\u0A3E\u0A30",
-  "\u0A36\u0A41\u0A71\u0A15\u0A30\u0A35\u0A3E\u0A30",
-  "\u0A36\u0A28\u0A40\u0A1A\u0A30\u0A35\u0A3E\u0A30"
- }
-
- DayAbbreviations{
-  "\u0A10\u0A24.",
-  "\u0A38\u0A4B\u0A2E.",
-  "\u0A2E\u0A70\u0A17\u0A32.",
-  "\u0A2C\u0A41\u0A27.",
-  "\u0A35\u0A40\u0A30.",
-  "\u0A36\u0A41\u0A15\u0A30.",
-  "\u0A36\u0A28\u0A40."
- }
-
- MonthNames{
-  "\u0A1C\u0A28\u0A35\u0A30\u0A40",
-  "\u0A5E\u0A30\u0A35\u0A30\u0A40",
-  "\u0A2E\u0A3E\u0A30\u0A1A",
-  "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32",
-  "\u0A2E\u0A08",
-  "\u0A1C\u0A42\u0A28",
-  "\u0A1C\u0A41\u0A32\u0A3E\u0A08",
-  "\u0A05\u0A17\u0A38\u0A24",
-  "\u0A38\u0A24\u0A70\u0A2C\u0A30",
-  "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30",
-  "\u0A28\u0A35\u0A70\u0A2C\u0A30",
-  "\u0A26\u0A38\u0A70\u0A2C\u0A30",
-  ""
- }
-
- MonthAbbreviations{
-  "\u0A1C\u0A28\u0A35\u0A30\u0A40",
-  "\u0A5E\u0A30\u0A35\u0A30\u0A40",
-  "\u0A2E\u0A3E\u0A30\u0A1A",
-  "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32",
-  "\u0A2E\u0A08",
-  "\u0A1C\u0A42\u0A28",
-  "\u0A1C\u0A41\u0A32\u0A3E\u0A08",
-  "\u0A05\u0A17\u0A38\u0A24",
-  "\u0A38\u0A24\u0A70\u0A2C\u0A30",
-  "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30",
-  "\u0A28\u0A35\u0A70\u0A2C\u0A30",
-  "\u0A26\u0A38\u0A70\u0A2C\u0A30",
-  ""
- }
-
- NumberElements{
-  ".",
-  ",",
-  ",",
-  "%",
-  ",",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
-
- NumberPatterns {
-    "#,##,##0.###;-#,##,##0.###",
-    "\u00A4 #,##,##0.00;-\u00A4 #,##,##0.00",
-    "#,##,##0%"
- }
- LocaleScript{ "Guru" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x2.0"}
+    LocaleID:int { 0x46 }
+    AmPmMarkers{
+        "\u0A38\u0A35\u0A47\u0A30\u0A47",
+        "\u0A36\u0A3E\u0A2E"
+    }
+//    ShortLanguage{
+//        "PAN"
+//    }
+    DayNames{
+        "\u0A10\u0A24\u0A35\u0A3E\u0A30",
+        "\u0A38\u0A4B\u0A2E\u0A35\u0A3E\u0A30",
+        "\u0A2E\u0A70\u0A17\u0A32\u0A35\u0A3E\u0A30",
+        "\u0A2C\u0A41\u0A27\u0A35\u0A3E\u0A30",
+        "\u0A35\u0A40\u0A30\u0A35\u0A3E\u0A30",
+        "\u0A36\u0A41\u0A71\u0A15\u0A30\u0A35\u0A3E\u0A30",
+        "\u0A36\u0A28\u0A40\u0A1A\u0A30\u0A35\u0A3E\u0A30"
+    }
+
+    DayAbbreviations{
+        "\u0A10\u0A24.",
+        "\u0A38\u0A4B\u0A2E.",
+        "\u0A2E\u0A70\u0A17\u0A32.",
+        "\u0A2C\u0A41\u0A27.",
+        "\u0A35\u0A40\u0A30.",
+        "\u0A36\u0A41\u0A15\u0A30.",
+        "\u0A36\u0A28\u0A40."
+    }
+
+    MonthNames{
+        "\u0A1C\u0A28\u0A35\u0A30\u0A40",
+        "\u0A5E\u0A30\u0A35\u0A30\u0A40",
+        "\u0A2E\u0A3E\u0A30\u0A1A",
+        "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32",
+        "\u0A2E\u0A08",
+        "\u0A1C\u0A42\u0A28",
+        "\u0A1C\u0A41\u0A32\u0A3E\u0A08",
+        "\u0A05\u0A17\u0A38\u0A24",
+        "\u0A38\u0A24\u0A70\u0A2C\u0A30",
+        "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30",
+        "\u0A28\u0A35\u0A70\u0A2C\u0A30",
+        "\u0A26\u0A38\u0A70\u0A2C\u0A30",
+    }
+
+    MonthAbbreviations{
+        "\u0A1C\u0A28\u0A35\u0A30\u0A40",
+        "\u0A5E\u0A30\u0A35\u0A30\u0A40",
+        "\u0A2E\u0A3E\u0A30\u0A1A",
+        "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32",
+        "\u0A2E\u0A08",
+        "\u0A1C\u0A42\u0A28",
+        "\u0A1C\u0A41\u0A32\u0A3E\u0A08",
+        "\u0A05\u0A17\u0A38\u0A24",
+        "\u0A38\u0A24\u0A70\u0A2C\u0A30",
+        "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30",
+        "\u0A28\u0A35\u0A70\u0A2C\u0A30",
+        "\u0A26\u0A38\u0A70\u0A2C\u0A30",
+    }
+
+    NumberElements{
+        ".",
+        ",",
+        ",",
+        "%",
+        ",",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+
+    NumberPatterns {
+        "#,##,##0.###;-#,##,##0.###",
+        "\u00A4 #,##,##0.00;-\u00A4 #,##,##0.00",
+        "#,##,##0%"
+        "#E0",
+    }
+    LocaleScript:array { "Guru" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/pa_IN.txt b/icu4c/source/data/locales/pa_IN.txt
index 86fdba34c1b..b7f9e4e358f 100644
--- a/icu4c/source/data/locales/pa_IN.txt
+++ b/icu4c/source/data/locales/pa_IN.txt
@@ -7,7 +7,7 @@
 
 pa_IN {
     Version { "x0.2" }
-    LocaleID{ "0446"}
+    LocaleID:int { 0x0446 }
 //    ShortCountry { IND }
 
     CurrencyElements {
diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt
index a6b55a079d2..d728a2e7c20 100644
--- a/icu4c/source/data/locales/pl.txt
+++ b/icu4c/source/data/locales/pl.txt
@@ -61,7 +61,7 @@ pl {
     Languages { 
         pl { "polski" }
     }
-    LocaleID { "15" }
+    LocaleID:int { 0x15 }
 //    LocaleString { "pl" }
     MonthAbbreviations { 
         "sty",
diff --git a/icu4c/source/data/locales/pl_PL.txt b/icu4c/source/data/locales/pl_PL.txt
index 24f4b359724..d3fedfb664c 100644
--- a/icu4c/source/data/locales/pl_PL.txt
+++ b/icu4c/source/data/locales/pl_PL.txt
@@ -20,5 +20,5 @@ pl_PL {
         "#E0",
     }
 //    ShortCountry { "POL" }
-    LocaleID { "0415" }
+    LocaleID:int { 0x0415 }
 }
diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt
index 08a37a01ffa..a7c79751539 100644
--- a/icu4c/source/data/locales/pt.txt
+++ b/icu4c/source/data/locales/pt.txt
@@ -169,7 +169,7 @@ pt {
         uz { "Usbeque" }
         zh { "Chin\u00eas" }
     }
-    LocaleID { "16" }
+    LocaleID:int { 0x16 }
 //    LocaleString { "pt" }
     MonthAbbreviations { 
         "Jan",
diff --git a/icu4c/source/data/locales/pt_BR.txt b/icu4c/source/data/locales/pt_BR.txt
index 7adb8e80080..009632521d4 100644
--- a/icu4c/source/data/locales/pt_BR.txt
+++ b/icu4c/source/data/locales/pt_BR.txt
@@ -23,7 +23,7 @@ pt_BR {
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID { "0416" }
+    LocaleID:int { 0x0416 }
 //    LocaleString { "pt_BR" }
 //    NumberPatterns { 
 //        "#,##0.###;-#,##0.###",
diff --git a/icu4c/source/data/locales/pt_PT.txt b/icu4c/source/data/locales/pt_PT.txt
index c4a80723698..3fe3f97f4cd 100644
--- a/icu4c/source/data/locales/pt_PT.txt
+++ b/icu4c/source/data/locales/pt_PT.txt
@@ -20,5 +20,5 @@ pt_PT {
         "#E0",
     }
 //    ShortCountry { "PRT" }
-    LocaleID { "0816" }
+    LocaleID:int { 0x0816 }
 }
diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt
index d0d26b44d23..cdbb78fabee 100644
--- a/icu4c/source/data/locales/ro.txt
+++ b/icu4c/source/data/locales/ro.txt
@@ -52,7 +52,7 @@ ro {
     Languages { 
         ro { "rom\u00E2n\u0103" }
     }
-    LocaleID { "18" }
+    LocaleID:int { 0x18 }
 //    LocaleString { "ro" }
     MonthAbbreviations { 
         "Ian",
diff --git a/icu4c/source/data/locales/ro_RO.txt b/icu4c/source/data/locales/ro_RO.txt
index 9d8dc0d95cd..28dc6affb1d 100644
--- a/icu4c/source/data/locales/ro_RO.txt
+++ b/icu4c/source/data/locales/ro_RO.txt
@@ -20,5 +20,5 @@ ro_RO {
         "#E0",
     }
 //    ShortCountry { "ROM" }
-    LocaleID { "0418" }
+    LocaleID:int { 0x0418 }
 }
diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt
index 980ea902c26..ffaa7ad0dd8 100644
--- a/icu4c/source/data/locales/root.txt
+++ b/icu4c/source/data/locales/root.txt
@@ -1123,7 +1123,7 @@ root {
         zu  { "Zulu" }
         zun { "Zuni" }
     }
-    LocaleID { "0000" }
+    LocaleID:int { 0x0000 }
 //    LocaleString { "en" }
     MonthAbbreviations { 
         "Jan",
diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt
index 295c883e5e2..e5bda34d56e 100644
--- a/icu4c/source/data/locales/ru.txt
+++ b/icu4c/source/data/locales/ru.txt
@@ -247,7 +247,7 @@ ru {
         za { "\u0417\u0443\u0430\u043d\u0433" }
         zu { "\u0417\u0443\u043b\u0443\u0441\u0441\u043a\u0438\u0439" }
     }
-    LocaleID { "19" }
+    LocaleID:int { 0x19 }
 //    LocaleString { "ru" }
     MonthAbbreviations { 
         "\u044F\u043D\u0432",
diff --git a/icu4c/source/data/locales/ru_RU.txt b/icu4c/source/data/locales/ru_RU.txt
index 2cc5718934f..16513a007de 100644
--- a/icu4c/source/data/locales/ru_RU.txt
+++ b/icu4c/source/data/locales/ru_RU.txt
@@ -20,5 +20,5 @@ ru_RU {
         "#E0",
     }
 //    ShortCountry { "RUS" }
-    LocaleID { "0419" }
+    LocaleID:int { 0x0419 }
 }
diff --git a/icu4c/source/data/locales/sa.txt b/icu4c/source/data/locales/sa.txt
index 98ca167f727..58dd23350d0 100644
--- a/icu4c/source/data/locales/sa.txt
+++ b/icu4c/source/data/locales/sa.txt
@@ -1,94 +1,94 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 sa {
- LocaleID{ "4F"}
- AmPmMarkers{
-  "\u092A\u0942\u0930\u094D\u0935\u093E\u0939\u094D\u0928",
-  "\u0905\u092A\u0930\u093E\u0939\u094D\u0928"
- }
- ShortLanguage{
-  "SAN"
- }
- DayNames{
-  "\u0930\u0935\u093F\u0935\u093E\u0938\u0930\u0903",
-  "\u0938\u094B\u092E\u0935\u093E\u0938\u0930\u0903",
-  "\u092E\u0919\u094D\u0917\u0932\u0935\u093E\u0938\u0930\u0903",
-  "\u092C\u0941\u0927\u0935\u093E\u0938\u0930\u0903",
-  "\u0917\u0941\u0930\u0941\u0935\u093E\u0938\u0930\u0903",
-  "\u0936\u0941\u0915\u094D\u0930\u0935\u093E\u0938\u0930\u0903",
-  "\u0936\u0928\u093F\u0935\u093E\u0938\u0930\u0903"
- }
-
- DayAbbreviations{
-  "\u0930\u0935\u093F\u0935\u093E\u0938\u0930\u0903",
-  "\u0938\u094B\u092E\u0935\u093E\u0938\u0930\u0903",
-  "\u092E\u0919\u094D\u0917\u0932\u0935\u093E\u0938\u0930\u0903",
-  "\u092C\u0941\u0927\u0935\u093E\u0938\u0930\u0903",
-  "\u0917\u0941\u0930\u0941\u0935\u093E\u0938\u0930\u0903",
-  "\u0936\u0941\u0915\u094D\u0930\u0935\u093E\u0938\u0930\u0903",
-  "\u0936\u0928\u093F\u0935\u093E\u0938\u0930\u0903"
- }
-
- MonthNames{
-  "\u091C\u0928\u0935\u0930\u0940",
-  "\u092B\u0930\u0935\u0930\u0940",
-  "\u092E\u093E\u0930\u094D\u091A",
-  "\u0905\u092A\u094D\u0930\u0948\u0932",
-  "\u092E\u0908",
-  "\u091C\u0942\u0928",
-  "\u091C\u0941\u0932\u093E\u0908",
-  "\u0905\u0917\u0938\u094D\u0924",
-  "\u0938\u093F\u0924\u092E\u094D\u092C\u0930",
-  "\u0905\u0915\u094D\u0924\u0942\u092C\u0930",
-  "\u0928\u0935\u092E\u094D\u092C\u0930",
-  "\u0926\u093F\u0938\u092E\u094D\u092C\u0930",
-  ""
- }
-
- MonthAbbreviations{
-  "\u091C\u0928\u0935\u0930\u0940",
-  "\u092B\u0930\u0935\u0930\u0940",
-  "\u092E\u093E\u0930\u094D\u091A",
-  "\u0905\u092A\u094D\u0930\u0948\u0932",
-  "\u092E\u0908",
-  "\u091C\u0942\u0928",
-  "\u091C\u0941\u0932\u093E\u0908",
-  "\u0905\u0917\u0938\u094D\u0924",
-  "\u0938\u093F\u0924\u092E\u094D\u092C\u0930",
-  "\u0905\u0915\u094D\u0924\u0942\u092C\u0930",
-  "\u0928\u0935\u092E\u094D\u092C\u0930",
-  "\u0926\u093F\u0938\u092E\u094D\u092C\u0930",
-  ""
- }
-
- NumberElements{
-  ".",
-  ",",
-  ",",
-  "%",
-  ",",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- NumberPatterns {
-    "#,##,##0.###;-#,##,##0.###",
-    "\u00A4 #,##,##0.00;-\u00A4 #,##,##0.00",
-    "#,##,##0%"
- }
- LocaleScript{ "Deva" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version { "x1.0" }
+    LocaleID:int { 0x4F }
+    AmPmMarkers{
+        "\u092A\u0942\u0930\u094D\u0935\u093E\u0939\u094D\u0928",
+        "\u0905\u092A\u0930\u093E\u0939\u094D\u0928"
+    }
+//    ShortLanguage{
+//        "SAN"
+//    }
+    DayNames{
+        "\u0930\u0935\u093F\u0935\u093E\u0938\u0930\u0903",
+        "\u0938\u094B\u092E\u0935\u093E\u0938\u0930\u0903",
+        "\u092E\u0919\u094D\u0917\u0932\u0935\u093E\u0938\u0930\u0903",
+        "\u092C\u0941\u0927\u0935\u093E\u0938\u0930\u0903",
+        "\u0917\u0941\u0930\u0941\u0935\u093E\u0938\u0930\u0903",
+        "\u0936\u0941\u0915\u094D\u0930\u0935\u093E\u0938\u0930\u0903",
+        "\u0936\u0928\u093F\u0935\u093E\u0938\u0930\u0903"
+    }
+
+    DayAbbreviations{
+        "\u0930\u0935\u093F\u0935\u093E\u0938\u0930\u0903",
+        "\u0938\u094B\u092E\u0935\u093E\u0938\u0930\u0903",
+        "\u092E\u0919\u094D\u0917\u0932\u0935\u093E\u0938\u0930\u0903",
+        "\u092C\u0941\u0927\u0935\u093E\u0938\u0930\u0903",
+        "\u0917\u0941\u0930\u0941\u0935\u093E\u0938\u0930\u0903",
+        "\u0936\u0941\u0915\u094D\u0930\u0935\u093E\u0938\u0930\u0903",
+        "\u0936\u0928\u093F\u0935\u093E\u0938\u0930\u0903"
+    }
+
+    MonthNames{
+        "\u091C\u0928\u0935\u0930\u0940",
+        "\u092B\u0930\u0935\u0930\u0940",
+        "\u092E\u093E\u0930\u094D\u091A",
+        "\u0905\u092A\u094D\u0930\u0948\u0932",
+        "\u092E\u0908",
+        "\u091C\u0942\u0928",
+        "\u091C\u0941\u0932\u093E\u0908",
+        "\u0905\u0917\u0938\u094D\u0924",
+        "\u0938\u093F\u0924\u092E\u094D\u092C\u0930",
+        "\u0905\u0915\u094D\u0924\u0942\u092C\u0930",
+        "\u0928\u0935\u092E\u094D\u092C\u0930",
+        "\u0926\u093F\u0938\u092E\u094D\u092C\u0930",
+    }
+
+    MonthAbbreviations{
+        "\u091C\u0928\u0935\u0930\u0940",
+        "\u092B\u0930\u0935\u0930\u0940",
+        "\u092E\u093E\u0930\u094D\u091A",
+        "\u0905\u092A\u094D\u0930\u0948\u0932",
+        "\u092E\u0908",
+        "\u091C\u0942\u0928",
+        "\u091C\u0941\u0932\u093E\u0908",
+        "\u0905\u0917\u0938\u094D\u0924",
+        "\u0938\u093F\u0924\u092E\u094D\u092C\u0930",
+        "\u0905\u0915\u094D\u0924\u0942\u092C\u0930",
+        "\u0928\u0935\u092E\u094D\u092C\u0930",
+        "\u0926\u093F\u0938\u092E\u094D\u092C\u0930",
+    }
+
+    NumberElements{
+        ".",
+        ",",
+        ",",
+        "%",
+        ",",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    NumberPatterns {
+        "#,##,##0.###;-#,##,##0.###",
+        "\u00A4 #,##,##0.00;-\u00A4 #,##,##0.00",
+        "#,##,##0%",
+        "#E0",
+    }
+    LocaleScript{ "Deva" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/sa_IN.txt b/icu4c/source/data/locales/sa_IN.txt
index 94e0eb40fb2..f3320c79329 100644
--- a/icu4c/source/data/locales/sa_IN.txt
+++ b/icu4c/source/data/locales/sa_IN.txt
@@ -7,7 +7,7 @@
 
 sa_IN {
     Version { "x0.2" }
-    LocaleID{ "044F"}
+    LocaleID:int { 0x044F }
 //    ShortCountry { IND }
 
     CurrencyElements {
diff --git a/icu4c/source/data/locales/sh.txt b/icu4c/source/data/locales/sh.txt
index 27ff72e8fcc..6e466bfd74a 100644
--- a/icu4c/source/data/locales/sh.txt
+++ b/icu4c/source/data/locales/sh.txt
@@ -304,7 +304,7 @@ sh {
         //ji { "Jidi\u0161" }  // Use "yi" instead
         yi { "Jidi\u0161" }
     }
-    LocaleID { "081a" }
+    LocaleID:int { 0x081a }
 //    LocaleString { "sh" }
     MonthAbbreviations { 
         "jan",
diff --git a/icu4c/source/data/locales/sh_YU.txt b/icu4c/source/data/locales/sh_YU.txt
index a5f08676196..dfcbb2d6e16 100644
--- a/icu4c/source/data/locales/sh_YU.txt
+++ b/icu4c/source/data/locales/sh_YU.txt
@@ -14,5 +14,5 @@ sh_YU {
     }
 //    LocaleString { "sh_YU" }
 //    ShortCountry { "YUG" }
-    LocaleID { "081a" }
+    LocaleID:int { 0x081a }
 }
diff --git a/icu4c/source/data/locales/sk.txt b/icu4c/source/data/locales/sk.txt
index 102f0507bd1..1a060907fb4 100644
--- a/icu4c/source/data/locales/sk.txt
+++ b/icu4c/source/data/locales/sk.txt
@@ -53,7 +53,7 @@ sk {
     Languages { 
         sk { "Sloven\u010Dina" }
     }
-    LocaleID { "1b" }
+    LocaleID:int { 0x1b }
 //    LocaleString { "sk" }
     MonthAbbreviations { 
         "jan",
diff --git a/icu4c/source/data/locales/sk_SK.txt b/icu4c/source/data/locales/sk_SK.txt
index def649f3785..da569d3aa86 100644
--- a/icu4c/source/data/locales/sk_SK.txt
+++ b/icu4c/source/data/locales/sk_SK.txt
@@ -20,5 +20,5 @@ sk_SK {
         "#E0",
     }
 //    ShortCountry { "SVK" }
-    LocaleID { "041b" }
+    LocaleID:int { 0x041b }
 }
diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt
index 724e1b1a098..d6a1f895c19 100644
--- a/icu4c/source/data/locales/sl.txt
+++ b/icu4c/source/data/locales/sl.txt
@@ -54,7 +54,7 @@ sl {
     Languages { 
         sl { "Sloven\u0161\u010Dina" }
     }
-    LocaleID { "24" }
+    LocaleID:int { 0x24 }
 //    LocaleString { "sl" }
     MonthAbbreviations { 
         "jan",
diff --git a/icu4c/source/data/locales/sl_SI.txt b/icu4c/source/data/locales/sl_SI.txt
index c771068290a..77d67a1a922 100644
--- a/icu4c/source/data/locales/sl_SI.txt
+++ b/icu4c/source/data/locales/sl_SI.txt
@@ -19,5 +19,5 @@ sl_SI {
 //        "#,##0%",
 //    }
 //    ShortCountry { "SVN" }
-    LocaleID { "0424" }
+    LocaleID:int { 0x0424 }
 }
diff --git a/icu4c/source/data/locales/sq.txt b/icu4c/source/data/locales/sq.txt
index 8154d877be1..a5b7a0a50b7 100644
--- a/icu4c/source/data/locales/sq.txt
+++ b/icu4c/source/data/locales/sq.txt
@@ -54,7 +54,7 @@ sq {
     Languages { 
         sq { "shqipe" }
     }
-    LocaleID { "1c" }
+    LocaleID:int { 0x1c }
 //    LocaleString { "sq" }
     MonthAbbreviations { 
         "Jan",
diff --git a/icu4c/source/data/locales/sq_AL.txt b/icu4c/source/data/locales/sq_AL.txt
index 13945c2cc31..883573b371e 100644
--- a/icu4c/source/data/locales/sq_AL.txt
+++ b/icu4c/source/data/locales/sq_AL.txt
@@ -20,5 +20,5 @@ sq_AL {
         "#E0",
     }
 //    ShortCountry { "ALB" }
-    LocaleID { "041c" }
+    LocaleID:int { 0x041c }
 }
diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt
index 57b00320a7d..872393dca72 100644
--- a/icu4c/source/data/locales/sr.txt
+++ b/icu4c/source/data/locales/sr.txt
@@ -326,7 +326,7 @@ sr {
         vi { "\u0412\u0438\u0458\u0435\u0442\u043D\u0430\u043C\u0441\u043A\u0438" }
         yi { "\u0408\u0438\u0434\u0438\u0448" }
     }
-    LocaleID { "0c1a" }
+    LocaleID:int { 0x0c1a }
 //    LocaleString { "sr" }
     MonthAbbreviations { 
         "\u0458\u0430\u043D",
diff --git a/icu4c/source/data/locales/sr_YU.txt b/icu4c/source/data/locales/sr_YU.txt
index 85c84fa0677..38dbcc9c3c4 100644
--- a/icu4c/source/data/locales/sr_YU.txt
+++ b/icu4c/source/data/locales/sr_YU.txt
@@ -15,5 +15,5 @@ sr_YU {
 //    LocaleString { "sr_YU" }
     /* Discarding duplicate data for tag: NumberPatterns */
 //    ShortCountry { "YUG" }
-    LocaleID { "0c1a" }
+    LocaleID:int { 0x0c1a }
 }
diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt
index 475f3991dab..d8d9756bb5d 100644
--- a/icu4c/source/data/locales/sv.txt
+++ b/icu4c/source/data/locales/sv.txt
@@ -148,7 +148,7 @@ sv {
         uk { "ukrainska" }
         zh { "kinesiska" }
     }
-    LocaleID { "1d" }
+    LocaleID:int { 0x1d }
 //    LocaleString { "sv" }
     MonthAbbreviations { 
         "jan",
diff --git a/icu4c/source/data/locales/sv_FI.txt b/icu4c/source/data/locales/sv_FI.txt
index fb0b1bdaf2d..15f80803c36 100644
--- a/icu4c/source/data/locales/sv_FI.txt
+++ b/icu4c/source/data/locales/sv_FI.txt
@@ -19,5 +19,5 @@ sv_FI {
         "#E0",
     }
 //    ShortCountry { "FIN" }
-    LocaleID { "081d" }
+    LocaleID:int { 0x081d }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/sv_SE.txt b/icu4c/source/data/locales/sv_SE.txt
index c18336b70a4..5d4c7f22327 100644
--- a/icu4c/source/data/locales/sv_SE.txt
+++ b/icu4c/source/data/locales/sv_SE.txt
@@ -20,5 +20,5 @@ sv_SE {
         "#E0",
     }
 //    ShortCountry { "SWE" }
-    LocaleID { "041d" }
+    LocaleID:int { 0x041d }
 }
diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt
index 21083b94ace..7c42949fcc9 100644
--- a/icu4c/source/data/locales/sw.txt
+++ b/icu4c/source/data/locales/sw.txt
@@ -44,7 +44,7 @@ sw {
     Languages { 
         sw  { "Kiswahili" }
     }
-    LocaleID { "0041" }
+    LocaleID:int { 0x0041 }
 //    LocaleString { "sw" }
     MonthAbbreviations { 
         "Jan",
diff --git a/icu4c/source/data/locales/sw_KE.txt b/icu4c/source/data/locales/sw_KE.txt
index 0f6e6b088ed..8de9cb713bf 100644
--- a/icu4c/source/data/locales/sw_KE.txt
+++ b/icu4c/source/data/locales/sw_KE.txt
@@ -23,5 +23,5 @@ sw_KE {
         "#E0",
     }
 //    ShortCountry { "KEN" }
-    LocaleID { "0441" }
+    LocaleID:int { 0x0441 }
 }
diff --git a/icu4c/source/data/locales/syr.txt b/icu4c/source/data/locales/syr.txt
index a1fe5444f9e..e67a731007e 100644
--- a/icu4c/source/data/locales/syr.txt
+++ b/icu4c/source/data/locales/syr.txt
@@ -1,87 +1,85 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 syr{
- Version{ "x0.1" }
- LocaleID{ "5A"}
- AmPmMarkers{
-  "\u0729.\u071B",
-  "\u0712.\u071B"
- }
- DayNames{
-  "\u071A\u0715\u00A0\u0712\u072B\u0712\u0710",
-  "\u072C\u072A\u071D\u0722\u00A0\u0712\u072B\u0712\u0710",
-  "\u072C\u0720\u072C\u0710\u00A0\u0712\u072B\u0712\u0710",
-  "\u0710\u072A\u0712\u0725\u0710\u00A0\u0712\u072B\u0712\u0710",
-  "\u071A\u0721\u072B\u0710\u00A0\u0712\u072B\u0712\u0710",
-  "\u0725\u072A\u0718\u0712\u072C\u0710",
-  "\u072B\u0712\u072C\u0710"
- }
-
- DayAbbreviations{
-  "\u070F\u0710\u00A0\u070F\u0712\u072B",
-  "\u070F\u0712\u00A0\u070F\u0712\u072B",
-  "\u070F\u0713\u00A0\u070F\u0712\u072B",
-  "\u070F\u0715\u00A0\u070F\u0712\u072B",
-  "\u070F\u0717\u00A0\u070F\u0712\u072B",
-  "\u070F\u0725\u072A\u0718\u0712",
-  "\u070F\u072B\u0712"
- }
-
- MonthNames{
-  "\u071F\u0722\u0718\u0722\u00A0\u0710\u071A\u072A\u071D",
-  "\u072B\u0712\u071B",
-  "\u0710\u0715\u072A",
-  "\u0722\u071D\u0723\u0722",
-  "\u0710\u071D\u072A",
-  "\u071A\u0719\u071D\u072A\u0722",
-  "\u072C\u0721\u0718\u0719",
-  "\u0710\u0712",
-  "\u0710\u071D\u0720\u0718\u0720",
-  "\u072C\u072B\u072A\u071D\u00A0\u0729\u0715\u071D\u0721",
-  "\u072C\u072B\u072A\u071D\u00A0\u0710\u071A\u072A\u071D",
-  "\u071F\u0722\u0718\u0722\u00A0\u0729\u0715\u071D\u0721",
-  ""
- }
-
- MonthAbbreviations{
-  "\u070F\u071F\u0722\u00A0\u070F\u0712",
-  "\u072B\u0712\u071B",
-  "\u0710\u0715\u072A",
-  "\u0722\u071D\u0723\u0722",
-  "\u0710\u071D\u072A",
-  "\u071A\u0719\u071D\u072A\u0722",
-  "\u072C\u0721\u0718\u0719",
-  "\u0710\u0712",
-  "\u0710\u071D\u0720\u0718\u0720",
-  "\u070F\u072C\u072B\u00A0\u070F\u0710",
-  "\u070F\u072C\u072B\u00A0\u070F\u0712",
-  "\u070F\u071F\u0722\u00A0\u070F\u0710",
-  ""
- }
-
- NumberElements{
-  ".",
-  ",",
-  ",",
-  "%",
-  ",",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Syrc" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.1" }
+    LocaleID:int { 0x5A }
+    AmPmMarkers{
+        "\u0729.\u071B",
+        "\u0712.\u071B"
+    }
+    DayNames{
+        "\u071A\u0715\u00A0\u0712\u072B\u0712\u0710",
+        "\u072C\u072A\u071D\u0722\u00A0\u0712\u072B\u0712\u0710",
+        "\u072C\u0720\u072C\u0710\u00A0\u0712\u072B\u0712\u0710",
+        "\u0710\u072A\u0712\u0725\u0710\u00A0\u0712\u072B\u0712\u0710",
+        "\u071A\u0721\u072B\u0710\u00A0\u0712\u072B\u0712\u0710",
+        "\u0725\u072A\u0718\u0712\u072C\u0710",
+        "\u072B\u0712\u072C\u0710"
+    }
+
+    DayAbbreviations{
+        "\u070F\u0710\u00A0\u070F\u0712\u072B",
+        "\u070F\u0712\u00A0\u070F\u0712\u072B",
+        "\u070F\u0713\u00A0\u070F\u0712\u072B",
+        "\u070F\u0715\u00A0\u070F\u0712\u072B",
+        "\u070F\u0717\u00A0\u070F\u0712\u072B",
+        "\u070F\u0725\u072A\u0718\u0712",
+        "\u070F\u072B\u0712"
+    }
+
+    MonthNames{
+        "\u071F\u0722\u0718\u0722\u00A0\u0710\u071A\u072A\u071D",
+        "\u072B\u0712\u071B",
+        "\u0710\u0715\u072A",
+        "\u0722\u071D\u0723\u0722",
+        "\u0710\u071D\u072A",
+        "\u071A\u0719\u071D\u072A\u0722",
+        "\u072C\u0721\u0718\u0719",
+        "\u0710\u0712",
+        "\u0710\u071D\u0720\u0718\u0720",
+        "\u072C\u072B\u072A\u071D\u00A0\u0729\u0715\u071D\u0721",
+        "\u072C\u072B\u072A\u071D\u00A0\u0710\u071A\u072A\u071D",
+        "\u071F\u0722\u0718\u0722\u00A0\u0729\u0715\u071D\u0721",
+    }
+
+    MonthAbbreviations{
+        "\u070F\u071F\u0722\u00A0\u070F\u0712",
+        "\u072B\u0712\u071B",
+        "\u0710\u0715\u072A",
+        "\u0722\u071D\u0723\u0722",
+        "\u0710\u071D\u072A",
+        "\u071A\u0719\u071D\u072A\u0722",
+        "\u072C\u0721\u0718\u0719",
+        "\u0710\u0712",
+        "\u0710\u071D\u0720\u0718\u0720",
+        "\u070F\u072C\u072B\u00A0\u070F\u0710",
+        "\u070F\u072C\u072B\u00A0\u070F\u0712",
+        "\u070F\u071F\u0722\u00A0\u070F\u0710",
+    }
+
+    NumberElements{
+        ".",
+        ",",
+        ",",
+        "%",
+        ",",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript:array { "Syrc" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/syr_SY.txt b/icu4c/source/data/locales/syr_SY.txt
index d79bc9db904..3d5702b451f 100644
--- a/icu4c/source/data/locales/syr_SY.txt
+++ b/icu4c/source/data/locales/syr_SY.txt
@@ -1,36 +1,36 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 syr_SY{
- Version{ "x0.1" }
- LocaleID{ "045A"}
- ShortCountry{
-  "SYR"
- }
- CurrencyElements{
-  "\u0644.\u0633.\u200F",
-  "SYP",
-  "."
- }
+    Version{ "x0.2" }
+    LocaleID:int { 0x045A }
+    ShortCountry{
+        "SYR"
+    }
+    CurrencyElements{
+        "\u0644.\u0633.\u200F",
+        "SYP",
+        "."
+    }
 
- DateTimePatterns{
-  "h:mm:ss aa",
-  "H:mm:ss",
-  "hh:mm:ss a",
-  "H:mm:ss",
-  "dd MMMM, yyyy",
-  "dd MMMM, yyyy",
-  "dd/MM/yyyy",
-  "dd/MM/yyyy",
-  "{1} {0}",
- }
+    DateTimePatterns{
+        "h:mm:ss aa",
+        "H:mm:ss",
+        "hh:mm:ss a",
+        "H:mm:ss",
+        "dd MMMM, yyyy",
+        "dd MMMM, yyyy",
+        "dd/MM/yyyy",
+        "dd/MM/yyyy",
+        "{1} {0}",
+    }
 
- DateTimeElements{
-  "5",
-  "1"
- }
+    DateTimeElements{
+        "5",
+        "1"
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/ta.txt b/icu4c/source/data/locales/ta.txt
index 0df42cab905..e6d2e694ad9 100644
--- a/icu4c/source/data/locales/ta.txt
+++ b/icu4c/source/data/locales/ta.txt
@@ -250,7 +250,7 @@ ta {
         Version { "1.0" }
         Sequence { "[normalization on]" }
     }
-    LocaleID { "49" }
+    LocaleID:int { 0x49 }
     LocaleScript:array {
         "Taml"   // ISO 15924 Name 
     }
diff --git a/icu4c/source/data/locales/ta_IN.txt b/icu4c/source/data/locales/ta_IN.txt
index 9b5936472d6..8d85f14de3c 100644
--- a/icu4c/source/data/locales/ta_IN.txt
+++ b/icu4c/source/data/locales/ta_IN.txt
@@ -9,7 +9,7 @@
 
 ta_IN {
     Version { "1.3" }
-    LocaleID { "449" }
+    LocaleID:int { 0x449 }
 //    ShortCountry { IND }
 
     CurrencyElements {
diff --git a/icu4c/source/data/locales/te.txt b/icu4c/source/data/locales/te.txt
index 2d29d91f24c..b64c9376bae 100644
--- a/icu4c/source/data/locales/te.txt
+++ b/icu4c/source/data/locales/te.txt
@@ -4,7 +4,7 @@
 // *   Corporation and others.  All Rights Reserved.
 // *
 // ***************************************************************************
-// $Revision: 1.10 $
+// $Revision: 1.11 $
 //
 // Telugu Locale. Data by Ram [ram@jtcsv.com]
 
@@ -70,7 +70,7 @@ te {
 //        "\u221e",
 //        "\ufffd",
 //    }
-    LocaleID { "4a"}
+    LocaleID:int { 0x4a }
     CollationElements {
         Version { "1.0" }
         Sequence { "[normalization on]" }
diff --git a/icu4c/source/data/locales/te_IN.txt b/icu4c/source/data/locales/te_IN.txt
index 71f3a4a803d..232b5684293 100644
--- a/icu4c/source/data/locales/te_IN.txt
+++ b/icu4c/source/data/locales/te_IN.txt
@@ -4,7 +4,7 @@
 // *   Corporation and others.  All Rights Reserved.
 // *
 // ***************************************************************************
-// $Revision: 1.8 $
+// $Revision: 1.9 $
 //
 // Telugu Locale. Data by Ram [ram@jtcsv.com]
 
@@ -45,6 +45,6 @@ te_IN {
     //    Width { "210" }
     //    Units { "mm" }
     //}
-    LocaleID {"44a"}
+    LocaleID:int { 0x44a }
 }
 
diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt
index 69eb535de90..a786a9102b3 100644
--- a/icu4c/source/data/locales/th.txt
+++ b/icu4c/source/data/locales/th.txt
@@ -198,7 +198,7 @@ th {
     Languages { 
         th { "\u0E44\u0E17\u0E22" }
     }
-    LocaleID { "1e" }
+    LocaleID:int { 0x1e }
 //    LocaleString { "th" }
     MonthAbbreviations { 
         "\u0E21.\u0E04.",
@@ -240,9 +240,9 @@ th {
             "Bangkok",
         }
     }
-//    LocaleScript{ 
-//                "Thai", // Script Name  
-//    }
+    LocaleScript{ 
+        "Thai", // Script Name  
+    }
 
     //------------------------------------------------------------
     // Rule Based Number Format Support
diff --git a/icu4c/source/data/locales/th_TH.txt b/icu4c/source/data/locales/th_TH.txt
index bbaad6f841f..b27feb27418 100644
--- a/icu4c/source/data/locales/th_TH.txt
+++ b/icu4c/source/data/locales/th_TH.txt
@@ -20,5 +20,5 @@ th_TH {
         "#E0",
     }
 //    ShortCountry { "THA" }
-    LocaleID { "041e" }
+    LocaleID:int { 0x041e }
 }
diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt
index 43022ba7270..d846a905ab5 100644
--- a/icu4c/source/data/locales/tr.txt
+++ b/icu4c/source/data/locales/tr.txt
@@ -57,7 +57,7 @@ tr {
     Languages { 
         tr { "T\u00FCrk\u00E7e" }
     }
-    LocaleID { "1f" }
+    LocaleID:int { 0x1f }
 //    LocaleString { "tr" }
     MonthAbbreviations { 
         "Oca",
diff --git a/icu4c/source/data/locales/tr_TR.txt b/icu4c/source/data/locales/tr_TR.txt
index 1c294592c76..a3547afe58e 100644
--- a/icu4c/source/data/locales/tr_TR.txt
+++ b/icu4c/source/data/locales/tr_TR.txt
@@ -20,5 +20,5 @@ tr_TR {
         "#E0",
     }
 //    ShortCountry { "TUR" }
-    LocaleID { "041f" }
+    LocaleID:int { 0x041f }
 }
diff --git a/icu4c/source/data/locales/tt.txt b/icu4c/source/data/locales/tt.txt
index 2d660f302f4..51f6bf37762 100644
--- a/icu4c/source/data/locales/tt.txt
+++ b/icu4c/source/data/locales/tt.txt
@@ -1,87 +1,84 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 tt{
- Version{ "x0.1" }
- LocaleID{ "44"}
- ShortLanguage{
-  "TTT"
- }
- DayNames{
-  "\u042F\u043A\u0448\u04D9\u043C\u0431\u0435",
-  "\u0414\u04AF\u0448\u04D9\u043C\u0431\u0435",
-  "\u0421\u0438\u0448\u04D9\u043C\u0431\u0435",
-  "\u0427\u04D9\u0440\u0448\u04D9\u043C\u0431\u0435",
-  "\u041F\u04D9\u043D\u0497\u0435\u0448\u04D9\u043C\u0431\u0435",
-  "\u0496\u043E\u043C\u0433\u0430",
-  "\u0428\u0438\u043C\u0431\u04D9"
- }
-
- DayAbbreviations{
-  "\u042F\u043A\u0448",
-  "\u0414\u04AF\u0448",
-  "\u0421\u0438\u0448",
-  "\u0427\u04D9\u0440\u0448",
-  "\u041F\u04D9\u043D\u0497",
-  "\u0496\u043E\u043C",
-  "\u0428\u0438\u043C"
- }
-
- MonthNames{
-  "\u0413\u044B\u0439\u043D\u0432\u0430\u0440\u044C",
-  "\u0424\u0435\u0432\u0440\u0430\u043B\u044C",
-  "\u041C\u0430\u0440\u0442",
-  "\u0410\u043F\u0440\u0435\u043B\u044C",
-  "\u041C\u0430\u0439",
-  "\u0418\u044E\u043D\u044C",
-  "\u0418\u044E\u043B\u044C",
-  "\u0410\u0432\u0433\u0443\u0441\u0442",
-  "\u0421\u0435\u043D\u0442\u044F\u0431\u0440\u044C",
-  "\u041E\u043A\u0442\u044F\u0431\u0440\u044C",
-  "\u041D\u043E\u044F\u0431\u0440\u044C",
-  "\u0414\u0435\u043A\u0430\u0431\u0440\u044C",
-  ""
- }
-
- MonthAbbreviations{
-  "\u0413\u044B\u0439\u043D\u0432",
-  "\u0424\u0435\u0432",
-  "\u041C\u0430\u0440",
-  "\u0410\u043F\u0440",
-  "\u041C\u0430\u0439",
-  "\u0418\u044E\u043D",
-  "\u0418\u044E\u043B",
-  "\u0410\u0432\u0433",
-  "\u0421\u0435\u043D",
-  "\u041E\u043A\u0442",
-  "\u041D\u043E\u044F",
-  "\u0414\u0435\u043A",
-  ""
- }
-
- NumberElements{
-  ",",
-  "\u00A0",
-  ";",
-  "%",
-  ";",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Cyrl" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.2" }
+    LocaleID:int { 0x44 }
+//    ShortLanguage{
+//        "TTT"
+//    }
+    DayNames{
+        "\u042F\u043A\u0448\u04D9\u043C\u0431\u0435",
+        "\u0414\u04AF\u0448\u04D9\u043C\u0431\u0435",
+        "\u0421\u0438\u0448\u04D9\u043C\u0431\u0435",
+        "\u0427\u04D9\u0440\u0448\u04D9\u043C\u0431\u0435",
+        "\u041F\u04D9\u043D\u0497\u0435\u0448\u04D9\u043C\u0431\u0435",
+        "\u0496\u043E\u043C\u0433\u0430",
+        "\u0428\u0438\u043C\u0431\u04D9"
+    }
+
+    DayAbbreviations{
+        "\u042F\u043A\u0448",
+        "\u0414\u04AF\u0448",
+        "\u0421\u0438\u0448",
+        "\u0427\u04D9\u0440\u0448",
+        "\u041F\u04D9\u043D\u0497",
+        "\u0496\u043E\u043C",
+        "\u0428\u0438\u043C"
+    }
+
+    MonthNames{
+        "\u0413\u044B\u0439\u043D\u0432\u0430\u0440\u044C",
+        "\u0424\u0435\u0432\u0440\u0430\u043B\u044C",
+        "\u041C\u0430\u0440\u0442",
+        "\u0410\u043F\u0440\u0435\u043B\u044C",
+        "\u041C\u0430\u0439",
+        "\u0418\u044E\u043D\u044C",
+        "\u0418\u044E\u043B\u044C",
+        "\u0410\u0432\u0433\u0443\u0441\u0442",
+        "\u0421\u0435\u043D\u0442\u044F\u0431\u0440\u044C",
+        "\u041E\u043A\u0442\u044F\u0431\u0440\u044C",
+        "\u041D\u043E\u044F\u0431\u0440\u044C",
+        "\u0414\u0435\u043A\u0430\u0431\u0440\u044C",
+    }
+    MonthAbbreviations{
+        "\u0413\u044B\u0439\u043D\u0432",
+        "\u0424\u0435\u0432",
+        "\u041C\u0430\u0440",
+        "\u0410\u043F\u0440",
+        "\u041C\u0430\u0439",
+        "\u0418\u044E\u043D",
+        "\u0418\u044E\u043B",
+        "\u0410\u0432\u0433",
+        "\u0421\u0435\u043D",
+        "\u041E\u043A\u0442",
+        "\u041D\u043E\u044F",
+        "\u0414\u0435\u043A",
+    }
+
+    NumberElements{
+        ",",
+        "\u00A0",
+        ";",
+        "%",
+        ";",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript:array { "Cyrl" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
 
diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt
index ef5d2c19e77..d2bf342f79b 100644
--- a/icu4c/source/data/locales/uk.txt
+++ b/icu4c/source/data/locales/uk.txt
@@ -83,7 +83,7 @@ uk {
     Languages { 
         uk { "\u0443\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430" }
     }
-    LocaleID { "22" }
+    LocaleID:int { 0x22 }
 //    LocaleString { "uk" }
     MonthAbbreviations { 
         "\u0421\u0456\u0447",
diff --git a/icu4c/source/data/locales/uk_UA.txt b/icu4c/source/data/locales/uk_UA.txt
index 11c8199a192..ca617cd936d 100644
--- a/icu4c/source/data/locales/uk_UA.txt
+++ b/icu4c/source/data/locales/uk_UA.txt
@@ -20,5 +20,5 @@ uk_UA {
         "#E0",
     }
 //    ShortCountry { "UKR" }
-    LocaleID { "0422" }
+    LocaleID:int { 0x0422 }
 }
diff --git a/icu4c/source/data/locales/ur.txt b/icu4c/source/data/locales/ur.txt
index 64993e422a8..8172e478c45 100644
--- a/icu4c/source/data/locales/ur.txt
+++ b/icu4c/source/data/locales/ur.txt
@@ -1,87 +1,85 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 ur{
- Version{ "x0.1" }
- LocaleID{ "20"}
- ShortLanguage{
-  "URD"
- }
- DayNames{
-  "\u0627\u062A\u0648\u0627\u0631",
-  "\u067E\u064A\u0631",
-  "\u0645\u0646\u06AF\u0644",
-  "\u0628\u062F\u06BE",
-  "\u062C\u0645\u0639\u0631\u0627\u062A",
-  "\u062C\u0645\u0639\u0647",
-  "\u0647\u0641\u062A\u0647"
- }
-
- DayAbbreviations{
-  "\u0627\u062A\u0648\u0627\u0631",
-  "\u067E\u064A\u0631",
-  "\u0645\u0646\u06AF\u0644",
-  "\u0628\u062F\u06BE",
-  "\u062C\u0645\u0639\u0631\u0627\u062A",
-  "\u062C\u0645\u0639\u0647",
-  "\u0647\u0641\u062A\u0647"
- }
-
- MonthNames{
-  "\u062C\u0646\u0648\u0631\u0649",
-  "\u0641\u0631\u0648\u0631\u0649",
-  "\u0645\u0627\u0631\u0686",
-  "\u0627\u067E\u0631\u064A\u0644",
-  "\u0645\u0626",
-  "\u062C\u0648\u0646",
-  "\u062C\u0648\u0644\u0627\u0678",
-  "\u0627\u06AF\u0633\u062A",
-  "\u0633\u062A\u0645\u0628\u0631",
-  "\u0627\u06A9\u062A\u0648\u0628\u0631",
-  "\u0646\u0648\u0645\u0628\u0631",
-  "\u062F\u0633\u0645\u0628\u0631",
-  ""
- }
-
- MonthAbbreviations{
-  "\u062C\u0646\u0648\u0631\u0649",
-  "\u0641\u0631\u0648\u0631\u0649",
-  "\u0645\u0627\u0631\u0686",
-  "\u0627\u067E\u0631\u064A\u0644",
-  "\u0645\u0626",
-  "\u062C\u0648\u0646",
-  "\u062C\u0648\u0644\u0627\u0678",
-  "\u0627\u06AF\u0633\u062A",
-  "\u0633\u062A\u0645\u0628\u0631",
-  "\u0627\u06A9\u062A\u0648\u0628\u0631",
-  "\u0646\u0648\u0645\u0628\u0631",
-  "\u062F\u0633\u0645\u0628\u0631",
-  ""
- }
- NumberElements{
-  ".",
-  ",",
-  ";",
-  "%",
-  ";",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Arab" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.2" }
+    LocaleID:int { 0x20 }
+//    ShortLanguage{
+//        "URD"
+//    }
+    DayNames{
+        "\u0627\u062A\u0648\u0627\u0631",
+        "\u067E\u064A\u0631",
+        "\u0645\u0646\u06AF\u0644",
+        "\u0628\u062F\u06BE",
+        "\u062C\u0645\u0639\u0631\u0627\u062A",
+        "\u062C\u0645\u0639\u0647",
+        "\u0647\u0641\u062A\u0647"
+    }
+
+    DayAbbreviations{
+        "\u0627\u062A\u0648\u0627\u0631",
+        "\u067E\u064A\u0631",
+        "\u0645\u0646\u06AF\u0644",
+        "\u0628\u062F\u06BE",
+        "\u062C\u0645\u0639\u0631\u0627\u062A",
+        "\u062C\u0645\u0639\u0647",
+        "\u0647\u0641\u062A\u0647"
+    }
+
+    MonthNames{
+        "\u062C\u0646\u0648\u0631\u0649",
+        "\u0641\u0631\u0648\u0631\u0649",
+        "\u0645\u0627\u0631\u0686",
+        "\u0627\u067E\u0631\u064A\u0644",
+        "\u0645\u0626",
+        "\u062C\u0648\u0646",
+        "\u062C\u0648\u0644\u0627\u0678",
+        "\u0627\u06AF\u0633\u062A",
+        "\u0633\u062A\u0645\u0628\u0631",
+        "\u0627\u06A9\u062A\u0648\u0628\u0631",
+        "\u0646\u0648\u0645\u0628\u0631",
+        "\u062F\u0633\u0645\u0628\u0631",
+    }
+
+    MonthAbbreviations{
+        "\u062C\u0646\u0648\u0631\u0649",
+        "\u0641\u0631\u0648\u0631\u0649",
+        "\u0645\u0627\u0631\u0686",
+        "\u0627\u067E\u0631\u064A\u0644",
+        "\u0645\u0626",
+        "\u062C\u0648\u0646",
+        "\u062C\u0648\u0644\u0627\u0678",
+        "\u0627\u06AF\u0633\u062A",
+        "\u0633\u062A\u0645\u0628\u0631",
+        "\u0627\u06A9\u062A\u0648\u0628\u0631",
+        "\u0646\u0648\u0645\u0628\u0631",
+        "\u062F\u0633\u0645\u0628\u0631",
+    }
+    NumberElements{
+        ".",
+        ",",
+        ";",
+        "%",
+        ";",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript:array { "Arab" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
 
 
diff --git a/icu4c/source/data/locales/ur_PK.txt b/icu4c/source/data/locales/ur_PK.txt
index 4aabb6f1846..e544151f8ee 100644
--- a/icu4c/source/data/locales/ur_PK.txt
+++ b/icu4c/source/data/locales/ur_PK.txt
@@ -1,31 +1,31 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 ur_PK{
- Version{ "x0.1" }
- LocaleID{ "0420"}
- ShortCountry{
-  "PAK"
- }
- CurrencyElements{
-  "Rs",
-  "PKR",
-  "."
- }
+    Version{ "x0.1" }
+    LocaleID:int { 0x0420 }
+//    ShortCountry{
+//        "PAK"
+//    }
+    CurrencyElements{
+        "Rs",
+        "PKR",
+        "."
+    }
 
- DateTimePatterns{
-  "h:mm:ss aa",
-  "H:mm:ss",
-  "h:mm:ss a",
-  "H:mm:ss",
-  "dd MMMM yyyy",
-  "dd MMMM yyyy",
-  "dd/MM/yyyy",
-  "dd/MM/yyyy",
-  "{1} {0}",
- }
+    DateTimePatterns{
+        "h:mm:ss aa",
+        "H:mm:ss",
+        "h:mm:ss a",
+        "H:mm:ss",
+        "dd MMMM yyyy",
+        "dd MMMM yyyy",
+        "dd/MM/yyyy",
+        "dd/MM/yyyy",
+        "{1} {0}",
+    }
 }
diff --git a/icu4c/source/data/locales/uz.txt b/icu4c/source/data/locales/uz.txt
index 8c3e0224272..2a12018f2c3 100644
--- a/icu4c/source/data/locales/uz.txt
+++ b/icu4c/source/data/locales/uz.txt
@@ -6,81 +6,79 @@
 // *******************************************************************************
 
 uz{
- Version{ "x0.1" }
- LocaleID{ "43"}
- ShortLanguage{
-  "UZB"
- }
- DayNames{
-  "\u044F\u043A\u0448\u0430\u043D\u0431\u0430",
-  "\u0434\u0443\u0448\u0430\u043D\u0431\u0430",
-  "\u0441\u0435\u0448\u0430\u043D\u0431\u0430",
-  "\u0447\u043E\u0440\u0448\u0430\u043D\u0431\u0430",
-  "\u043F\u0430\u0439\u0448\u0430\u043D\u0431\u0430",
-  "\u0436\u0443\u043C\u0430",
-  "\u0448\u0430\u043D\u0431\u0430"
- }
-
- DayAbbreviations{
-  "\u044F\u043A\u0448",
-  "\u0434\u0448",
-  "\u0441\u0448",
-  "\u0447\u0448",
-  "\u043F\u0448",
-  "\u0436",
-  "\u0448"
- }
-
- MonthNames{
-  "\u042F\u043D\u0432\u0430\u0440",
-  "\u0424\u0435\u0432\u0440\u0430\u043B",
-  "\u041C\u0430\u0440\u0442",
-  "\u0410\u043F\u0440\u0435\u043B",
-  "\u041C\u0430\u0439",
-  "\u0418\u044E\u043D",
-  "\u0418\u044E\u043B",
-  "\u0410\u0432\u0433\u0443\u0441\u0442",
-  "\u0421\u0435\u043D\u0442\u044F\u0431\u0440",
-  "\u041E\u043A\u0442\u044F\u0431\u0440",
-  "\u041D\u043E\u044F\u0431\u0440",
-  "\u0414\u0435\u043A\u0430\u0431\u0440",
-  ""
- }
-
- MonthAbbreviations{
-  "\u042F\u043D\u0432",
-  "\u0424\u0435\u0432",
-  "\u041C\u0430\u0440",
-  "\u0410\u043F\u0440",
-  "\u041C\u0430\u0439",
-  "\u0418\u044E\u043D",
-  "\u0418\u044E\u043B",
-  "\u0410\u0432\u0433",
-  "\u0421\u0435\u043D",
-  "\u041E\u043A\u0442",
-  "\u041D\u043E\u044F",
-  "\u0414\u0435\u043A",
-  ""
- }
-
- NumberElements{
-  ",",
-  "\u00A0",
-  ";",
-  "%",
-  ";",
-  "#",
-  "-",
-  "E",
-  "\u2030",
-  "\u221e",
-  "\ufffd",
- }
- LocaleScript{ "Cyrl" }
- CollationElements {	    
-    Version { "1.0" }
-    Sequence { 
-         "[normalization on]"
+    Version{ "x0.1" }
+    LocaleID:int { 0x43 }
+//    ShortLanguage{
+//        "UZB"
+//    }
+    DayNames{
+        "\u044F\u043A\u0448\u0430\u043D\u0431\u0430",
+        "\u0434\u0443\u0448\u0430\u043D\u0431\u0430",
+        "\u0441\u0435\u0448\u0430\u043D\u0431\u0430",
+        "\u0447\u043E\u0440\u0448\u0430\u043D\u0431\u0430",
+        "\u043F\u0430\u0439\u0448\u0430\u043D\u0431\u0430",
+        "\u0436\u0443\u043C\u0430",
+        "\u0448\u0430\u043D\u0431\u0430"
+    }
+
+    DayAbbreviations{
+        "\u044F\u043A\u0448",
+        "\u0434\u0448",
+        "\u0441\u0448",
+        "\u0447\u0448",
+        "\u043F\u0448",
+        "\u0436",
+        "\u0448"
+    }
+
+    MonthNames{
+        "\u042F\u043D\u0432\u0430\u0440",
+        "\u0424\u0435\u0432\u0440\u0430\u043B",
+        "\u041C\u0430\u0440\u0442",
+        "\u0410\u043F\u0440\u0435\u043B",
+        "\u041C\u0430\u0439",
+        "\u0418\u044E\u043D",
+        "\u0418\u044E\u043B",
+        "\u0410\u0432\u0433\u0443\u0441\u0442",
+        "\u0421\u0435\u043D\u0442\u044F\u0431\u0440",
+        "\u041E\u043A\u0442\u044F\u0431\u0440",
+        "\u041D\u043E\u044F\u0431\u0440",
+        "\u0414\u0435\u043A\u0430\u0431\u0440",
+    }
+
+    MonthAbbreviations{
+        "\u042F\u043D\u0432",
+        "\u0424\u0435\u0432",
+        "\u041C\u0430\u0440",
+        "\u0410\u043F\u0440",
+        "\u041C\u0430\u0439",
+        "\u0418\u044E\u043D",
+        "\u0418\u044E\u043B",
+        "\u0410\u0432\u0433",
+        "\u0421\u0435\u043D",
+        "\u041E\u043A\u0442",
+        "\u041D\u043E\u044F",
+        "\u0414\u0435\u043A",
+    }
+
+    NumberElements{
+        ",",
+        "\u00A0",
+        ";",
+        "%",
+        ";",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221e",
+        "\ufffd",
+    }
+    LocaleScript:array { "Cyrl" }
+    CollationElements {	    
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
     }
- }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/uz_UZ.txt b/icu4c/source/data/locales/uz_UZ.txt
index 62f6c240b04..41ea2656f44 100644
--- a/icu4c/source/data/locales/uz_UZ.txt
+++ b/icu4c/source/data/locales/uz_UZ.txt
@@ -1,29 +1,29 @@
-// *******************************************************************************
+// ***************************************************************************
 // *
-// *   Copyright (C) 2001-2004, International Business Machines
+// *   Copyright (C) 2001-2002, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
-// *******************************************************************************
+// ***************************************************************************
 
 uz_UZ{
- Version{ "x0.1" }
- LocaleID{ "0843"}
+    Version{ "x0.1" }
+    LocaleID:int { 0x0843 }
 
- CurrencyElements{
-  "\u0441\u045E\u043C",
-  "UZS",
-  ","
- }
+    CurrencyElements{
+        "\u0441\u045E\u043C",
+        "UZS",
+        ","
+    }
 
- DateTimePatterns{
-  "hh:mm:ss aa",
-  "H:mm:ss",
-  "HH:mm:ss",
-  "HH:mm:ss",
-  "yyyy '\u0439\u0438\u043B' d-MMMM",
-  "yyyy '\u0439\u0438\u043B' d-MMMM",
-  "dd.MM.yyyy",
-  "dd.MM.yyyy",
-  "{1} {0}",
- }
+    DateTimePatterns{
+        "hh:mm:ss aa",
+        "H:mm:ss",
+        "HH:mm:ss",
+        "HH:mm:ss",
+        "yyyy '\u0439\u0438\u043B' d-MMMM",
+        "yyyy '\u0439\u0438\u043B' d-MMMM",
+        "dd.MM.yyyy",
+        "dd.MM.yyyy",
+        "{1} {0}",
+    }
 }
\ No newline at end of file
diff --git a/icu4c/source/data/locales/vi.txt b/icu4c/source/data/locales/vi.txt
index c185dd725a1..e9a6880aae9 100644
--- a/icu4c/source/data/locales/vi.txt
+++ b/icu4c/source/data/locales/vi.txt
@@ -42,7 +42,7 @@ vi {
         "Th\u01B0\u0301 ba\u0309y",
         "Chu\u0309 nh\u00E2\u0323t",
     }
-    LocaleID { "002A" }
+    LocaleID:int { 0x002A }
 //    LocaleString { "vi" }
     MonthAbbreviations {
         "Thg 1",
diff --git a/icu4c/source/data/locales/vi_VN.txt b/icu4c/source/data/locales/vi_VN.txt
index b1ab7f3ec2e..982ffdace99 100644
--- a/icu4c/source/data/locales/vi_VN.txt
+++ b/icu4c/source/data/locales/vi_VN.txt
@@ -12,7 +12,7 @@ vi_VN {
         "VND",
         ",",
     }
-    LocaleID { "042A" }
+    LocaleID:int { 0x042A }
 //    LocaleString { "vi_VN" }
 //    ShortCountry { "VNM" }
 }
diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt
index f0ff5fb5eca..df96018ff1a 100644
--- a/icu4c/source/data/locales/zh.txt
+++ b/icu4c/source/data/locales/zh.txt
@@ -1133,7 +1133,7 @@ zh {
         za { "\u85cf\u6587" }
         zu { "\u7956\u9c81\u6587" }
     }
-    LocaleID { "04" }
+    LocaleID:int { 0x04 }
 //    LocaleString { "zh" }
     MonthAbbreviations { 
         "\u4E00\u6708",
diff --git a/icu4c/source/data/locales/zh_CN.txt b/icu4c/source/data/locales/zh_CN.txt
index 2c5a2ac307f..787b260bc23 100644
--- a/icu4c/source/data/locales/zh_CN.txt
+++ b/icu4c/source/data/locales/zh_CN.txt
@@ -25,7 +25,7 @@ zh_CN {
         TW { "\u53F0\u6E7E" }
         HK { "\u9999\u6E2F" }
     }
-    LocaleID { "0804" }
+    LocaleID:int { 0x0804 }
 
     DateTimePatterns { 
         "HH'\u65F6'mm'\u5206'ss'\u79D2' z",
diff --git a/icu4c/source/data/locales/zh_HK.txt b/icu4c/source/data/locales/zh_HK.txt
index ea5bdf4779e..63c5e7016c1 100644
--- a/icu4c/source/data/locales/zh_HK.txt
+++ b/icu4c/source/data/locales/zh_HK.txt
@@ -1124,7 +1124,7 @@ zh_HK {
         "\u4E94",
         "\u516D",
     }
-    LocaleID { "0c04" }
+    LocaleID:int { 0x0c04 }
 //    LocaleString { "zh_HK" }
     MonthAbbreviations { 
         "1\u6708",
diff --git a/icu4c/source/data/locales/zh_MO.txt b/icu4c/source/data/locales/zh_MO.txt
index c7e411ae695..4bae75b2015 100644
--- a/icu4c/source/data/locales/zh_MO.txt
+++ b/icu4c/source/data/locales/zh_MO.txt
@@ -1125,7 +1125,7 @@ zh_MO {
         "\u4E94",
         "\u516D",
     }
-    LocaleID { "1404" }
+    LocaleID:int { 0x1404 }
 //    LocaleString { "zh_MO" }
     MonthAbbreviations { 
         "1\u6708",
diff --git a/icu4c/source/data/locales/zh_SG.txt b/icu4c/source/data/locales/zh_SG.txt
index 6705ab148a1..a7405d99f87 100644
--- a/icu4c/source/data/locales/zh_SG.txt
+++ b/icu4c/source/data/locales/zh_SG.txt
@@ -5,7 +5,7 @@
 // *   Corporation and others.  All Rights Reserved.
 // *
 // ***************************************************************************
-// $Revision: 1.4 $
+// $Revision: 1.5 $
 // Singapore locale: Data By Syn Wee Quek
 
 
@@ -44,7 +44,7 @@ zh_SG {
         "{1} {0}"
     }
 
-    LocaleID { "1004" }
+    LocaleID:int { 0x1004 }
 
 //    ShortCountry { "SIN" } // copied from zh_EN.txt
 
diff --git a/icu4c/source/data/locales/zh_TW.txt b/icu4c/source/data/locales/zh_TW.txt
index 42115d3781f..97fd98c2a5d 100644
--- a/icu4c/source/data/locales/zh_TW.txt
+++ b/icu4c/source/data/locales/zh_TW.txt
@@ -1325,7 +1325,7 @@ zh_TW {
         "\u6C11\u570B\u524D",
         "\u6C11\u570B",
     }
-    LocaleID { "0404" }
+    LocaleID:int { 0x0404 }
 //    LocaleString { "zh_TW" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c
index e9060168831..13f855df83c 100644
--- a/icu4c/source/test/cintltst/cloctst.c
+++ b/icu4c/source/test/cintltst/cloctst.c
@@ -1462,7 +1462,7 @@ TestKeyInRootRecursive(UResourceBundle *root, UResourceBundle *currentBundle, co
             /* Here is one of the recursive parts */
             TestKeyInRootRecursive(subRootBundle, subBundle, locale);
         }
-        else if (ures_getType(subBundle) == RES_BINARY) {
+        else if (ures_getType(subBundle) == RES_BINARY || ures_getType(subBundle) == RES_INT) {
             /* Can't do anything to check it */
             /* We'll assume it's all correct */
             log_verbose("Skipping key \"%s\" in \"%s\" for locale \"%s\"\n",
@@ -1495,8 +1495,10 @@ testLCID(UResourceBundle *currentBundle,
     char lcidStringC[64] = {0};
     int32_t lcidStringLen = 0;
     const UChar *lcidString = NULL;
+    UResourceBundle *localeID = ures_getByKey(currentBundle, "LocaleID", NULL, &status);
 
-    lcidString = ures_getStringByKey(currentBundle, "LocaleID", &lcidStringLen, &status);
+    expectedLCID = ures_getInt(localeID, &status);
+    ures_close(localeID);
 
     if (U_FAILURE(status)) {
         log_err("ERROR:   %s does not have a LocaleID (%s)\n",
@@ -1504,9 +1506,6 @@ testLCID(UResourceBundle *currentBundle,
         return;
     }
 
-    u_UCharsToChars(lcidString, lcidStringC, lcidStringLen + 1);
-    expectedLCID = uprv_strtoul(lcidStringC, NULL, 16);
-
     lcid = T_convertToLCID(localeName, &status);
     if (U_FAILURE(status)) {
         if (expectedLCID == 0) {
diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c
index 8e5ff7f20ff..7c4efcc9ac8 100644
--- a/icu4c/source/test/cintltst/creststn.c
+++ b/icu4c/source/test/cintltst/creststn.c
@@ -1678,22 +1678,22 @@ static void TestFallback()
     /* Temporary hack err actually should be U_USING_FALLBACK_ERROR */
     /* Test Jitterbug 552 fallback mechanism of aliased data */
     {
-        char tempChars[256];
         UErrorCode err =U_ZERO_ERROR;
         UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err);
-        const UChar*  myLocID = ures_getStringByKey(myResB, "LocaleID", &resultLen, &err);
+        UResourceBundle* resLocID = ures_getByKey(myResB, "LocaleID", NULL, &err);
         UResourceBundle* tResB;
         if(err != U_ZERO_ERROR){
             log_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for LocaleID err=%s\n",u_errorName(err));
+            return;
         }
-        u_UCharsToChars(myLocID, tempChars, u_strlen(myLocID) + 1);
-        if(uprv_strcmp(tempChars, "0814")){
-            log_err("Expected LocaleID=814, but got %s\n", tempChars);
+        if(ures_getInt(resLocID, &err) != 0x814){
+            log_err("Expected LocaleID=814, but got 0x%X\n", ures_getInt(resLocID, &err));
         }
         tResB = ures_getByKey(myResB, "DayNames", NULL, &err);
         if(err != U_USING_FALLBACK_ERROR){
             log_err("Expected U_USING_FALLBACK_ERROR when trying to test no_NO_NY aliased with nn_NO_NY for DayNames err=%s\n",u_errorName(err));
         }
+        ures_close(resLocID);
         ures_close(myResB);
         ures_close(tResB);
 
diff --git a/icu4c/source/tools/gencnval/gencnval.c b/icu4c/source/tools/gencnval/gencnval.c
index 413cb7155e1..3c3365c3b85 100644
--- a/icu4c/source/tools/gencnval/gencnval.c
+++ b/icu4c/source/tools/gencnval/gencnval.c
@@ -34,6 +34,8 @@
 #include "unewdata.h"
 #include "uoptions.h"
 
+/* TODO: Need to specify the maximum alias name length in a header (see ucnv_io.c::findalias()) */
+
 #define STRING_STORE_SIZE 100000
 #define MAX_ALIAS_COUNT 2000
 
@@ -175,7 +177,7 @@ main(int argc, char* argv[]) {
             uprv_strcpy((char *)path, "convrtrs.txt");
             path=line;
         } else {
-            path="convrtrs.txt";
+            path = "convrtrs.txt";
         }
     }
     in=T_FileStream_open(path, "r");
@@ -405,7 +407,7 @@ getTagNumber(const char *tag, uint16_t tagLen) {
     char *atag;
     uint16_t t;
 
-    if (tagCount == MAX_TAG_COUNT) {
+    if (tagCount >= MAX_TAG_COUNT) {
         fprintf(stderr, "gencnval: too many tags\n");
         exit(U_BUFFER_OVERFLOW_ERROR);
     }
@@ -418,7 +420,7 @@ getTagNumber(const char *tag, uint16_t tagLen) {
 
     /* we need to add this tag */
 
-    if (tagCount == MAX_TAG_COUNT) {
+    if (tagCount >= MAX_TAG_COUNT) {
         fprintf(stderr, "gencnval: too many tags\n");
         exit(U_BUFFER_OVERFLOW_ERROR);
     }
@@ -444,28 +446,30 @@ addTaggedAlias(uint16_t tag, const char *alias, uint16_t converter) {
 
 static uint16_t
 addAlias(const char *alias, uint16_t converter) {
-    if(aliasCount==MAX_ALIAS_COUNT) {
+    if(aliasCount>=MAX_ALIAS_COUNT) {
         fprintf(stderr, "gencnval: too many aliases\n");
         exit(U_BUFFER_OVERFLOW_ERROR);
     }
 
-    aliases[aliasCount].alias=alias;
-    aliases[aliasCount].converter=converter;
+    /* TODO: Check for duplicates */
+    aliases[aliasCount].alias = alias;
+    aliases[aliasCount].converter = converter;
 
-    ++converters[converter].aliasCount;
+    converters[converter].aliasCount++;
 
     return aliasCount++;
 }
 
 static uint16_t
 addConverter(const char *converter) {
-    if(converterCount==MAX_ALIAS_COUNT) {
+    if(converterCount>=MAX_ALIAS_COUNT) {
         fprintf(stderr, "gencnval: too many converters\n");
         exit(U_BUFFER_OVERFLOW_ERROR);
     }
 
-    converters[converterCount].converter=converter;
-    converters[converterCount].aliasCount=0;
+    /* TODO: Check for duplicates */
+    converters[converterCount].converter = converter;
+    converters[converterCount].aliasCount = 0;
 
     return converterCount++;
 }
@@ -475,12 +479,12 @@ allocString(StringBlock *block, uint32_t length) {
     uint32_t top=block->top+length;
     char *p;
 
-    if(top>block->max) {
+    if(top > block->max) {
         fprintf(stderr, "gencnval: out of memory\n");
         exit(U_MEMORY_ALLOCATION_ERROR);
     }
-    p=block->store+block->top;
-    block->top=top;
+    p = block->store + block->top;
+    block->top = top;
     return p;
 }