diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index db0258319ce14e..987b6861207e97 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -91768,7 +91768,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </enum>
 
 <enum name="GATTCharacteristicHash" type="int">
-<!-- Hash values can be produced using tool: bluetooth_metrics_hash (Only built via GN, not GYP) -->
+<!-- Hash values can be produced using tool: bluetooth_metrics_hash -->
 
   <int value="1615384" label="alert_notification_control_point"/>
   <int value="4531384" label="date_of_birth"/>
@@ -91777,6 +91777,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="36624371"
       label="Anki OVERDRIVE cars; be15bee0-6186-407e-8381-0bd89c4d8df4"/>
   <int value="40437408" label="gender"/>
+  <int value="42833873" label="42833873 (Unknown; not a 16bit UUID)"/>
   <int value="64893984" label="local_east_coordinate.xml"/>
   <int value="67768539" label="alert_category_id_bit_mask"/>
   <int value="79560451" label="sc_control_point"/>
@@ -91848,6 +91849,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="419477741" label="body_composition_feature"/>
   <int value="440009071"
       label="konashi pwmDuty; 229b3006-03fb-40da-98a7-b0def65c2d4b"/>
+  <int value="448606809" label="448606809 (Unknown; not a 16bit UUID)"/>
   <int value="469191968" label="Playbulb Candle Color; fffc"/>
   <int value="473092981"
       label="Eddystone Config Advertising Interval;
@@ -91928,6 +91930,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="910416910"
       label="nRF UART RX; nrf52-Quadcopter;
              6e400003-b5a3-f393-e0a9-e50e24dcca9e"/>
+  <int value="912333311" label="912333311 (Unknown; not a 16bit UUID)"/>
   <int value="917477908" label="software_revision_string"/>
   <int value="918961501" label="plx_spot_check_measurement"/>
   <int value="922434244" label="ln_feature"/>
@@ -91968,6 +91971,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       label="konashi uartTx; 229b3012-03fb-40da-98a7-b0def65c2d4b"/>
   <int value="1161713439" label="Playbulb Candle Effect; fffb"/>
   <int value="1167525145" label="alert_status"/>
+  <int value="1169219288" label="1169219288 (Unknown; not a 16bit UUID)"/>
   <int value="1183399370" label="magnetic_flux_density_3D"/>
   <int value="1186677690"
       label="Eddystone Config Advertised Tx Power;
@@ -91983,6 +91987,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       label="Sphero Robot; 22bb746f-2ba1-7554-2d6f-726568705327"/>
   <int value="1245615057" label="pnp_id"/>
   <int value="1254532025" label="user_control_point"/>
+  <int value="1266038031" label="1266038031 (Unknown; not a 16bit UUID)"/>
   <int value="1288236137" label="hid_control_point"/>
   <int value="1307935876"
       label="Tacx trainer; 6e40fec3-b5a3-f393-e0a9-e50e24dcca9e"/>
@@ -91995,6 +92000,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="1333242790" label="longitude"/>
   <int value="1334750659"
       label="konashi i2cWrite; 229b300d-03fb-40da-98a7-b0def65c2d4b"/>
+  <int value="1352512695" label="1352512695 (Unknown; not a 16bit UUID)"/>
   <int value="1358488787"
       label="sport_type_for_aerobic_and_anaerobic_thresholds"/>
   <int value="1359562687"
@@ -92020,6 +92026,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="1480262218" label="height"/>
   <int value="1482584061"
       label="konashi pioPullUp; 229b3001-03fb-40da-98a7-b0def65c2d4b"/>
+  <int value="1485392010" label="1485392010 (Unknown; not a 16bit UUID)"/>
   <int value="1501299347"
       label="nRF candy machine; a6c31338-6c07-453e-961a-d8a8a41bf368"/>
   <int value="1502604093" label="serial_number_string"/>
@@ -92075,6 +92082,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       label="Elite trainer; 347b0010-7635-408b-8918-8ff3949ce592"/>
   <int value="1847017753"
       label="konashi pwmConfig; 229b3004-03fb-40da-98a7-b0def65c2d4b"/>
+  <int value="1853459100" label="1853459100 (Unknown; not a 16bit UUID)"/>
   <int value="1855704654" label="latitude"/>
   <int value="1863022784"
       label="Parrot Drone; 9a66fd24-0800-9191-11e4-012d1540cb8e"/>
@@ -92091,6 +92099,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="1954594648" label="temperature"/>
   <int value="1970019437" label="gap.peripheral_privacy_flag"/>
   <int value="1981651466" label="wind_chill"/>
+  <int value="1984759904" label="1984759904 (Unknown; not a 16bit UUID)"/>
   <int value="1999174392" label="glucose_measurement_context"/>
   <int value="2000824522" label="waist_circumference"/>
   <int value="2010182602" label="csc_feature"/>
@@ -92112,6 +92121,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       label="konashi pioInputNotification;
              229b3003-03fb-40da-98a7-b0def65c2d4b"/>
   <int value="2091531878" label="weight_scale_feature"/>
+  <int value="2100140560" label="2100140560 (Unknown; not a 16bit UUID)"/>
   <int value="2101185135" label="time_zone"/>
   <int value="2105952193" label="heart_rate_max"/>
   <int value="2110830087"
@@ -92122,7 +92132,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </enum>
 
 <enum name="GATTServiceHash" type="int">
-<!-- Hash values can be produced using tool: bluetooth_metrics_hash (Only built via GN, not GYP) -->
+<!-- Hash values can be produced using tool: bluetooth_metrics_hash -->
 
   <int value="7464675" label="pulse_oximeter"/>
   <int value="26695985" label="fe20"/>
@@ -92150,6 +92160,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="130754956" label="fe0d"/>
   <int value="134110769" label="fecf"/>
   <int value="141942246" label="fe1d"/>
+  <int value="150370668" label="150370668 (Unknown; not a 16bit UUID)"/>
   <int value="152492105" label="fe5f"/>
   <int value="169501939" label="fe4d"/>
   <int value="199936534" label="fe3c"/>
@@ -92221,8 +92232,10 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       label="PowerUp RC plane; 75b64e51-f181-4ed1-921a-476090d80ba7"/>
   <int value="603143198" label="fef5"/>
   <int value="604112254" label="fee4"/>
+  <int value="612248808" label="612248808 (Unknown; not a 16bit UUID)"/>
   <int value="617434027" label="fe59"/>
   <int value="621358948" label="fec7"/>
+  <int value="626013607" label="FIDO authentication service (fffd)"/>
   <int value="633977000" label="fedf"/>
   <int value="634740644"
       label="Purple Eye; 00005100-0000-1000-8000-00805f9b34fb"/>
@@ -92339,6 +92352,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="1295501517" label="fef3"/>
   <int value="1300474367" label="fe70"/>
   <int value="1300496660" label="fe23"/>
+  <int value="1324131957" label="ff08; 0000ff08-0000-1000-8000-00805f9b34fb"/>
   <int value="1327498374"
       label="nRF UART; 6e400001-b5a3-f393-e0a9-e50e24dcca9e"/>
   <int value="1344502489" label="fe92"/>
@@ -92368,6 +92382,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="1482395712"
       label="Bleno Pizza Example; 13333333-3333-3333-3333-333333333337"/>
   <int value="1484296385" label="fe30"/>
+  <int value="1486406094" label="1486406094 (Unknown; not a 16bit UUID)"/>
   <int value="1513113754" label="fe39"/>
   <int value="1515793787" label="fef1"/>
   <int value="1545945606"
@@ -92403,8 +92418,11 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="1682716946" label="fe45"/>
   <int value="1694516494" label="fe31"/>
   <int value="1696287138" label="weight_scale"/>
+  <int value="1697181639" label="1697181639 (Unknown; not a 16bit UUID)"/>
   <int value="1701893879" label="feac"/>
+  <int value="1704852137" label="1704852137 (Unknown; not a 16bit UUID)"/>
   <int value="1706666451" label="fea7"/>
+  <int value="1708135819" label="1708135819 (Unknown; not a 16bit UUID)"/>
   <int value="1712085581"
       label="MiP Robot; Magic Blue Bulb; 0000ffe5-0000-1000-8000-00805f9b34fb"/>
   <int value="1714031075" label="fe10"/>
@@ -92427,6 +92445,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="1833458622" label="fe42"/>
   <int value="1844072312" label="fe40"/>
   <int value="1849709266" label="fec3"/>
+  <int value="1852765173" label="1852765173 (Unknown; not a 16bit UUID)"/>
   <int value="1855849484"
       label="iHealth Edge; 636f6d2e-6a69-7561-6e2e-414d56313100"/>
   <int value="1891274929" label="fee2"/>