diff --git a/tools/clang/plugins/FindBadConstructsConsumer.cpp b/tools/clang/plugins/FindBadConstructsConsumer.cpp
index cb674ce..2bf41d5 100644
--- a/tools/clang/plugins/FindBadConstructsConsumer.cpp
+++ b/tools/clang/plugins/FindBadConstructsConsumer.cpp
@@ -332,12 +332,7 @@
   if (max_enumerators.find(max_value) == max_enumerators.end()) {
     ReportIfSpellingLocNotIgnored(max_value->getLocation(),
                                   diag_bad_enum_max_value_)
-#if defined(LLVM_FORCE_HEAD_REVISION)
         << toString(max_seen, 10);
-#else
-        // TODO(crbug.com/1218876): Remove after clang roll.
-        << max_seen.toString(10);
-#endif
   } else if (max_enumerators.size() < 2) {
     ReportIfSpellingLocNotIgnored(decl->getLocation(),
                                   diag_enum_max_value_unique_);
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 49e793a..6023cb8 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -39,7 +39,7 @@
 # https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang.md
 # Reverting problematic clang rolls is safe, though.
 # This is the output of `git describe` and is usable as a commit-ish.
-CLANG_REVISION = 'llvmorg-13-init-12576-g643b6407'
+CLANG_REVISION = 'llvmorg-13-init-12881-g4017d033'
 CLANG_SUB_REVISION = 1
 
 PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
diff --git a/tools/ipc_fuzzer/fuzzer/DEPS b/tools/ipc_fuzzer/fuzzer/DEPS
index 746c34c..bb695bb 100644
--- a/tools/ipc_fuzzer/fuzzer/DEPS
+++ b/tools/ipc_fuzzer/fuzzer/DEPS
@@ -1,6 +1,8 @@
 include_rules = [
   "+components/content_settings",
   "+components/viz/common",
+  "+gpu/ipc/common",
+  "+media/gpu/ipc/common",
   "+printing/mojom",
   "+third_party/skia/include",
   "+third_party/blink/public",
diff --git a/tools/ipc_fuzzer/fuzzer/fuzzer.cc b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
index 1bd56ed..a723f52 100644
--- a/tools/ipc_fuzzer/fuzzer/fuzzer.cc
+++ b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
@@ -20,10 +20,12 @@
 #include "build/build_config.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/viz/common/surfaces/frame_sink_id.h"
+#include "gpu/ipc/common/gpu_param_traits_macros.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message.h"
+#include "media/gpu/ipc/common/media_param_traits.h"
 #include "printing/mojom/print.mojom-shared.h"
 #include "third_party/blink/public/common/page_state/page_state.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/tools/ipc_fuzzer/message_lib/all_messages.h b/tools/ipc_fuzzer/message_lib/all_messages.h
index 0c6176c..d005c67d 100644
--- a/tools/ipc_fuzzer/message_lib/all_messages.h
+++ b/tools/ipc_fuzzer/message_lib/all_messages.h
@@ -24,5 +24,4 @@
 #include "components/guest_view/common/guest_view_message_generator.h"
 #include "content/common/all_messages.h"
 #include "extensions/common/extension_message_generator.h"
-#include "media/gpu/ipc/common/media_message_generator.h"
 #include "remoting/host/chromoting_messages.h"
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index bd61bc6d..b5f2a2f 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -7103,6 +7103,8 @@
   <int value="13" label="Large upload waiting to retry"/>
   <int value="14" label="System scenario triggered"/>
   <int value="15" label="Reached code scenario triggered"/>
+  <int value="16"
+      label="Trace finalization started with a local output location"/>
 </enum>
 
 <enum name="BackingStoreResults">
@@ -13739,6 +13741,7 @@
   <int value="76" label="File system access chooser data"/>
   <int value="77" label="Federated identity sharing"/>
   <int value="78" label="Federated identity request"/>
+  <int value="79" label="Javascript JIT"/>
 </enum>
 
 <enum name="ContentTypeParseableResult">
@@ -24891,6 +24894,9 @@
   <int value="864" label="RemoteDebuggingAllowed"/>
   <int value="865" label="ManagedWebAppsAccessToDeviceAttributesAllowed"/>
   <int value="866" label="BrowserSwitcherParsingMode"/>
+  <int value="867" label="DefaultJavaScriptJitSetting"/>
+  <int value="868" label="JavaScriptJitAllowedForSites"/>
+  <int value="869" label="JavaScriptJitBlockedForSites"/>
 </enum>
 
 <enum name="EnterprisePolicyDeviceIdValidity">
@@ -32968,6 +32974,7 @@
   <int value="3939" label="XRFrameFillJointRadii"/>
   <int value="3940" label="XRFrameFillPoses"/>
   <int value="3941" label="WindowOpenNewPopupBehaviorMismatch"/>
+  <int value="3942" label="ExplicitPointerCaptureClickTargetDiff"/>
 </enum>
 
 <enum name="FeaturePolicyAllowlistType">
@@ -34815,6 +34822,7 @@
   <int value="2" label="Show sync screen"/>
   <int value="3" label="Close sync screen with sync"/>
   <int value="4" label="Close sync screen without sync"/>
+  <int value="5" label="Close sync screen on advance sync settings"/>
 </enum>
 
 <enum name="FirstUserActionType">
@@ -45697,6 +45705,8 @@
   <int value="-1596489715" label="AutoScreenBrightness:enabled"/>
   <int value="-1594298767" label="FullscreenToolbarReveal:enabled"/>
   <int value="-1591450227" label="enable-microphone-mute-switch-device"/>
+  <int value="-1589720671"
+      label="DebugHistoryInterventionNoUserActivation:disabled"/>
   <int value="-1588702520" label="WebOTPCrossDevice:disabled"/>
   <int value="-1586642651" label="MaterialDesignExtensions:disabled"/>
   <int value="-1585733447" label="ContextualSearchUnityIntegration:disabled"/>
@@ -47335,6 +47345,8 @@
   <int value="-220298483" label="ImeOptionsInSettings:enabled"/>
   <int value="-217885320" label="CdmFactoryDaemon:disabled"/>
   <int value="-216219963" label="ash-shelf-color-scheme"/>
+  <int value="-216189310"
+      label="DebugHistoryInterventionNoUserActivation:enabled"/>
   <int value="-215580565"
       label="OmniboxEnableClipboardProviderImageSuggestions:disabled"/>
   <int value="-215534141" label="NativeWindowNavButtons:enabled"/>
@@ -59899,6 +59911,7 @@
   <int value="703" label="Plugin Vm Shared Paths"/>
   <int value="704" label="Plugin Vm USB Preferences"/>
   <int value="705" label="On Startup"/>
+  <int value="706" label="App Notifications"/>
   <int value="800" label="Crostini Details"/>
   <int value="801" label="Crostini Manage Shared Folders"/>
   <int value="802" label="Crostini Usb Preferences"/>
@@ -63964,6 +63977,10 @@
   <int value="9" label="kVideoPlayback"/>
   <int value="10" label="kLoadingAnimation"/>
   <int value="11" label="kMainThreadAnimation"/>
+  <int value="12" label="kSmallAnimation"/>
+  <int value="13" label="kMediumAnimation"/>
+  <int value="14" label="kSmallMainThreadAnimation"/>
+  <int value="15" label="kMediumMainThreadAnimation"/>
 </enum>
 
 <enum name="PowerSupplyType">
@@ -84874,47 +84891,61 @@
 
 <enum name="WebUIUrlHashes">
   <int value="-2103246641" label="chrome://signin-internals/"/>
+  <int value="-2061366287" label="chrome://dev-ui-loader/"/>
   <int value="-2034706497" label="chrome://net-internals/"/>
   <int value="-2031269077" label="chrome://signin-error/"/>
   <int value="-2025866230" label="chrome://usb-internals/"/>
   <int value="-2024468885" label="chrome://ntp-tiles-internals/"/>
+  <int value="-2020874093" label="chrome://lock-reauth/"/>
   <int value="-1977692791" label="chrome://crash/"/>
+  <int value="-1949142440" label="chrome://smb-credentials-dialog/"/>
   <int value="-1911971715" label="chrome://history/"/>
   <int value="-1887206190" label="chrome://nfc-debug/"/>
   <int value="-1825876526" label="chrome://delayeduithreadhang/"/>
   <int value="-1808179141" label="chrome://password-manager-internals/"/>
   <int value="-1777503123" label="chrome://thumb2/"/>
   <int value="-1743341803" label="chrome://bookmarks/"/>
+  <int value="-1737358104" label="chrome://account-migration-welcome/"/>
   <int value="-1729122580" label="chrome://chrome-urls/"/>
   <int value="-1704400468" label="chrome://quit/"/>
   <int value="-1700864659" label="chrome://slow/"/>
+  <int value="-1697612520" label="chrome://print-management/"/>
   <int value="-1697077152" label="chrome://device-log/"/>
   <int value="-1690355375" label="chrome://mobilesetup/"/>
   <int value="-1681544613" label="chrome://print/"/>
+  <int value="-1649429396" label="chrome://chrome-signin/edu-coexistence/"/>
   <int value="-1647734092" label="chrome://net-export/"/>
   <int value="-1638649228" label="chrome://webapks/"/>
+  <int value="-1634933990" label="chrome://web-footer-experiment/"/>
   <int value="-1591890659" label="chrome://syncfs-internals/"/>
   <int value="-1493822642" label="chrome://invalidations/"/>
+  <int value="-1493762713" label="chrome://settings/cookies/"/>
   <int value="-1475777739" label="chrome://physical-web-diagnostics/"/>
   <int value="-1440785181" label="chrome://profile-signin-confirmation/"/>
   <int value="-1423026122" label="chrome://md-user-manager/"/>
+  <int value="-1401057585" label="chrome://account-manager-error/"/>
   <int value="-1398642514" label="chrome://gesture/"/>
   <int value="-1382906531" label="chrome://managed-user-passphrase/"/>
   <int value="-1379571130" label="chrome://newtab/"/>
   <int value="-1378421581" label="chrome://media-router/"/>
   <int value="-1331415629" label="chrome://os-settings/"/>
   <int value="-1313432739" label="chrome://plugins/"/>
+  <int value="-1259871417" label="chrome://browser-switch/"/>
   <int value="-1239015343" label="chrome://kill/"/>
   <int value="-1224398205" label="chrome://prefs-internals/"/>
+  <int value="-1203248739" label="chrome://scanning/"/>
+  <int value="-1198437953" label="chrome://download-shelf.top-chrome/"/>
   <int value="-1169621742" label="chrome://linux-proxy-config/"/>
   <int value="-1137946367" label="chrome://webrt-logs/"/>
   <int value="-1108319739" label="chrome://sync-internals/"/>
+  <int value="-1087461470" label="chrome://management/"/>
   <int value="-1082746738" label="chrome://credits/"/>
   <int value="-1078583150" label="chrome://view-cert-dialog/"/>
   <int value="-1043041749" label="chrome://offline-internals/"/>
   <int value="-986409800" label="chrome://identity-internals/"/>
   <int value="-969979971" label="chrome://sandbox/"/>
   <int value="-946383082" label="chrome://translate-internals/"/>
+  <int value="-940484840" label="chrome://arc-power-control/"/>
   <int value="-936786926" label="chrome://settings/"/>
   <int value="-907485548" label="chrome://policy-tool/"/>
   <int value="-905972126" label="chrome://signin-email-confirmation/"/>
@@ -84930,19 +84961,25 @@
   <int value="-707542503" label="chrome://choose-mobile-network/"/>
   <int value="-672072143" label="chrome://site-engagement/"/>
   <int value="-661305899" label="chrome://set-time/"/>
+  <int value="-652517395" label="chrome://signin-reauth/"/>
   <int value="-644310325" label="chrome://os-credits/"/>
   <int value="-631384656" label="chrome://assistant-optin/"/>
   <int value="-624584089"
       label="chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/ (Bookmark
              Manager)"/>
+  <int value="-623121238" label="chrome://arc-graphics-tracing/"/>
+  <int value="-614294009" label="chrome://crostini-credits/"/>
   <int value="-606058756" label="chrome://accessibility/"/>
   <int value="-566908909" label="chrome://suggestions/"/>
+  <int value="-548156607" label="chrome://feedback/"/>
   <int value="-528306235" label="chrome://sync/"/>
   <int value="-516792794" label="chrome://downloads/"/>
   <int value="-512782085" label="chrome://salsa/"/>
   <int value="-511253776" label="chrome://snippets-internals/"/>
   <int value="-485494550" label="chrome://interventions-internals/"/>
   <int value="-451371558" label="chrome://serviceworker-internals/"/>
+  <int value="-443189279" label="chrome://enterprise-profile-welcome/"/>
+  <int value="-394586044" label="chrome://confirm-password-change/"/>
   <int value="-377028639" label="chrome://copresence/"/>
   <int value="-359703631" label="chrome://slow_trace/"/>
   <int value="-245337017" label="chrome://user-actions/"/>
@@ -84954,6 +84991,7 @@
   <int value="-88246682" label="chrome://uithreadhang/"/>
   <int value="-68100096" label="chrome://welcome-win10/"/>
   <int value="-42737706" label="chrome://extensions-frame/"/>
+  <int value="-12304525" label="chrome://tab-strip/"/>
   <int value="-2353438" label="chrome://sim-unlock/"/>
   <int value="1377205" label="chrome://history-frame/"/>
   <int value="9727114" label="chrome://favicon/"/>
@@ -84963,53 +85001,73 @@
   <int value="47779771" label="chrome://media-router-internals/"/>
   <int value="48333657" label="chrome://about/"/>
   <int value="58807865" label="chrome://local-state/"/>
+  <int value="84832110" label="chrome://fileicon/"/>
   <int value="112165789" label="chrome://device-emulator/"/>
   <int value="114748825" label="chrome-devtools://devtools/"/>
   <int value="164517522" label="chrome://discards/"/>
   <int value="171659041" label="chrome://webrtc-device-provider/"/>
   <int value="253258497" label="chrome://components/"/>
+  <int value="259900466" label="chrome://signin-dice-web-intercept/"/>
   <int value="260253931" label="chrome://devices/"/>
   <int value="275260142" label="chrome://eoc-internals/"/>
   <int value="325375649" label="chrome://settings-frame/"/>
+  <int value="361250371" label="chrome://nearby/"/>
   <int value="361621847" label="chrome://make-metro/"/>
+  <int value="399773145" label="chrome://commander/"/>
+  <int value="436626245" label="chrome://settings/content/cookies/"/>
+  <int value="454041716" label="chrome://new-tab-page-third-party/"/>
   <int value="461287992" label="chrome://help/"/>
+  <int value="507734656" label="chrome://profile-customization/"/>
   <int value="520299179" label="chrome://media-engagement/"/>
   <int value="554090510" label="chrome://first-run/"/>
   <int value="581234974" label="chrome://tcmalloc/"/>
+  <int value="584098160" label="chrome://profile-picker/"/>
   <int value="607659257" label="chrome://cast/"/>
+  <int value="634002171" label="chrome://projector-selfie-cam/"/>
   <int value="646837226" label="chrome://crashes/"/>
   <int value="659389881" label="chrome://gpu/"/>
+  <int value="662045902" label="chrome://smb-share-dialog/"/>
   <int value="689991895" label="chrome://supervised-user-internals/"/>
   <int value="742272091" label="chrome://extensions/"/>
+  <int value="748142712" label="chrome://crostini-upgrader/"/>
+  <int value="749881882" label="chrome://webuijserror/"/>
   <int value="754315733" label="chrome://theme/"/>
   <int value="784140714" label="chrome://predictors/"/>
   <int value="812624791" label="chrome://dom-distiller/"/>
   <int value="821023334" label="chrome://screenlock-icon/"/>
+  <int value="864711974" label="chrome://emoji-picker/"/>
   <int value="894368493" label="chrome://internet-config-dialog/"/>
   <int value="911597664" label="chrome://multidevice-setup/"/>
   <int value="918960088" label="chrome://instant/"/>
   <int value="943766809" label="chrome://view-cert/"/>
   <int value="977219287" label="chrome://memory/"/>
   <int value="985294599" label="chrome://webrtc-logs/"/>
+  <int value="1050328415" label="chrome://diagnostics/"/>
   <int value="1055519744" label="chrome://webrtc-internals/"/>
   <int value="1066907868" label="chrome://physical-web/"/>
   <int value="1109407387" label="chrome://keyboardoverlay/"/>
   <int value="1131405887" label="chrome://taskscheduler-internals/"/>
+  <int value="1134924982" label="chrome://app-icon/"/>
+  <int value="1145000455" label="chrome://arc-overview-tracing/"/>
   <int value="1148733422" label="chrome://restart/"/>
   <int value="1211642987" label="chrome://voicesearch/"/>
   <int value="1213428635" label="chrome://memory-redirect/"/>
   <int value="1214710734" label="chrome://welcome/"/>
   <int value="1221097359" label="chrome://constrained-test/"/>
+  <int value="1272316136" label="chrome://image/"/>
   <int value="1281801197" label="chrome://terms/"/>
   <int value="1286620182" label="chrome://reset-password/"/>
   <int value="1306215264" label="chrome://activationmessage/"/>
   <int value="1326111536" label="chrome://new-tab-page/"/>
   <int value="1340926535" label="chrome://network/"/>
   <int value="1354146226" label="chrome://tab-modal-confirm-dialog/"/>
+  <int value="1356087814" label="chrome://add-supervision/"/>
   <int value="1371905827" label="chrome://flags/"/>
   <int value="1396129399" label="chrome://flash/"/>
+  <int value="1397728473" label="chrome://crostini-installer/"/>
   <int value="1399992914" label="chrome://java-crash/"/>
   <int value="1403605293" label="chrome://internet-detail-dialog/"/>
+  <int value="1411665301" label="chrome://lock-network/"/>
   <int value="1427179406" label="chrome://gcm-internals/"/>
   <int value="1454088830" label="chrome://uber-frame/"/>
   <int value="1457759734" label="chrome://user-manager/"/>
@@ -85018,6 +85076,8 @@
   <int value="1467342679" label="chrome://memory-internals/"/>
   <int value="1476643520" label="chrome://internet-detail-dialog/"/>
   <int value="1506419762" label="devtools://devtools/"/>
+  <int value="1531448147"
+      label="chrome://urgent-password-expiry-notification/"/>
   <int value="1540230808" label="chrome://power/"/>
   <int value="1554928128" label="chrome://sync-confirmation/?consent-bump"/>
   <int value="1568301017" label="chrome://media-internals/"/>
@@ -85027,19 +85087,24 @@
   <int value="1628875649" label="chrome://quota-internals/"/>
   <int value="1631369147" label="chrome://domain-reliability-internals/"/>
   <int value="1662453825" label="chrome://indexeddb-internals/"/>
+  <int value="1673299360" label="chrome://tab-search.top-chrome/"/>
   <int value="1677735296" label="chrome://sync-confirmation/"/>
   <int value="1687272877" label="chrome://syncresources/"/>
   <int value="1725906496" label="chrome://imageburner/"/>
   <int value="1765337366" label="chrome://certificate-manager/"/>
   <int value="1776179126" label="chrome://thumb/"/>
   <int value="1797107942" label="chrome://md-settings/"/>
+  <int value="1834776370" label="chrome://password-change/"/>
   <int value="1887784693" label="chrome://policy/"/>
   <int value="1926101309" label="chrome://cryptohome/"/>
+  <int value="1928106753" label="chrome://app-disabled/"/>
   <int value="1961263039" label="chrome://profiler/"/>
+  <int value="1963964324" label="chrome://read-later.top-chrome/"/>
   <int value="1975618905" label="chrome://app-list/"/>
   <int value="2040878656" label="chrome://bluetooth-internals/"/>
   <int value="2052019697" label="chrome://userimage/"/>
   <int value="2114840772" label="chrome://drive-internals/"/>
+  <int value="2120829362" label="chrome://account-manager-welcome/"/>
   <int value="3251925547" label="chrome://offline-internals/"/>
 </enum>
 
diff --git a/tools/metrics/histograms/histograms_xml/METRIC_REVIEWER_OWNERS b/tools/metrics/histograms/histograms_xml/METRIC_REVIEWER_OWNERS
index 6e6782e0..a7c8cfeb 100644
--- a/tools/metrics/histograms/histograms_xml/METRIC_REVIEWER_OWNERS
+++ b/tools/metrics/histograms/histograms_xml/METRIC_REVIEWER_OWNERS
@@ -16,6 +16,7 @@
 eirage@chromium.org
 ellyjones@chromium.org
 ender@chromium.org
+evliu@google.com
 harrisonsean@chromium.org
 iclelland@chromium.org
 javierrobles@chromium.org
diff --git a/tools/metrics/histograms/histograms_xml/accessibility/OWNERS b/tools/metrics/histograms/histograms_xml/accessibility/OWNERS
new file mode 100644
index 0000000..f95573b
--- /dev/null
+++ b/tools/metrics/histograms/histograms_xml/accessibility/OWNERS
@@ -0,0 +1,5 @@
+per-file OWNERS=file://tools/metrics/histograms/histograms_xml/METRIC_REVIEWER_OWNERS
+
+# Prefer sending CLs to the owners listed below.
+# Use chromium-metrics-reviews@google.com as a backup.
+evliu@google.com
diff --git a/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml b/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
index 0dc3516..a26c236 100644
--- a/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
@@ -878,7 +878,7 @@
 </histogram>
 
 <histogram name="Accessibility.LiveCaption.LoadSodaErrorCode"
-    enum="WinGetLastError" expires_after="2021-07-18">
+    enum="WinGetLastError" expires_after="2021-09-30">
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -890,7 +890,7 @@
 </histogram>
 
 <histogram name="Accessibility.LiveCaption.LoadSodaResult"
-    enum="LoadSodaResult" expires_after="2021-07-18">
+    enum="LoadSodaResult" expires_after="2021-09-30">
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -918,7 +918,7 @@
 
 <histogram
     name="Accessibility.LiveCaption.SodaVerificationFailureMissingIndicatorFile"
-    enum="Boolean" expires_after="2021-07-18">
+    enum="Boolean" expires_after="2021-09-30">
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
diff --git a/tools/metrics/histograms/histograms_xml/apps/histograms.xml b/tools/metrics/histograms/histograms_xml/apps/histograms.xml
index 8ec147e..c3c2220 100644
--- a/tools/metrics/histograms/histograms_xml/apps/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/apps/histograms.xml
@@ -1006,6 +1006,19 @@
   </summary>
 </histogram>
 
+<histogram name="Apps.AppListBubbleShowSource" enum="AppListShowSource"
+    expires_after="2022-06-15">
+  <owner>newcomer@chromium.org</owner>
+  <owner>chromeos-launcher@google.com</owner>
+  <summary>
+    The number of times the different sources for showing the bubble app list
+    are used. This is logged when the bubble app list is shown, which only
+    exists in clamshell mode. See sister metric
+    &quot;Apps.AppListShowSource&quot; for tablet mode and fullscreen app list
+    metrics.
+  </summary>
+</histogram>
+
 <histogram name="Apps.AppListCreationTime" units="ms"
     expires_after="2021-04-18">
   <owner>calamity@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/autofill/histograms.xml b/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
index 341d7cf..660d5bc 100644
--- a/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
@@ -69,6 +69,11 @@
       summary="Request failed in retrieving the virtual card information."/>
 </variants>
 
+<variants name="Autofill.Snackbar.Type">
+  <variant name="VirtualCard"
+      summary="Snackbar shown after virtual card is autofilled."/>
+</variants>
+
 <histogram
     name="Autofill.Ablation.FillDurationSinceInteraction.{FormType}.{Group}"
     units="ms" expires_after="M100">
@@ -1821,6 +1826,28 @@
   </summary>
 </histogram>
 
+<histogram name="Autofill.Snackbar.{SnackbarType}.ActionClicked"
+    enum="BooleanShown" expires_after="2022-02-01">
+  <owner>siashah@chromium.org</owner>
+  <owner>jsaul@google.com</owner>
+  <summary>
+    Emits true when the action button on the autofill snackbar is clicked and
+    does not emit any value otherwise.
+  </summary>
+  <token key="SnackbarType" variants="Autofill.Snackbar.Type"/>
+</histogram>
+
+<histogram name="Autofill.Snackbar.{SnackbarType}.Shown" enum="BooleanShown"
+    expires_after="2022-02-01">
+  <owner>siashah@chromium.org</owner>
+  <owner>jsaul@google.com</owner>
+  <summary>
+    Emits true when the autofill snackbar is displayed and does not emit any
+    value otherwise.
+  </summary>
+  <token key="SnackbarType" variants="Autofill.Snackbar.Type"/>
+</histogram>
+
 <histogram name="Autofill.StoredCreditCardCount" units="cards"
     expires_after="2021-12-12">
   <owner>battre@chromium.org</owner>
diff --git a/tools/metrics/histograms/histograms_xml/bluetooth/histograms.xml b/tools/metrics/histograms/histograms_xml/bluetooth/histograms.xml
index 81e65ab..fe32478 100644
--- a/tools/metrics/histograms/histograms_xml/bluetooth/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/bluetooth/histograms.xml
@@ -325,12 +325,9 @@
 </histogram>
 
 <histogram name="Bluetooth.Web.Characteristic.ReadValue.Outcome"
-    enum="WebBluetoothGATTOperationOutcome" expires_after="2021-01-31">
-  <obsolete>
-    Removed 2021/04/09. crbug.com/1052935
-  </obsolete>
-  <owner>ortuno@chromium.org</owner>
-  <owner>reillyg@chromium.org</owner>
+    enum="WebBluetoothGATTOperationOutcome" expires_after="M97">
+  <owner>cmumford@chromium.org</owner>
+  <owner>deviceapi-team@google.com</owner>
   <summary>
     Records the outcome of a call to characteristic.readValue(). Used to know
     what types of errors users are seeing. The results will be used to determine
@@ -340,12 +337,9 @@
 </histogram>
 
 <histogram name="Bluetooth.Web.Characteristic.StartNotifications.Outcome"
-    enum="WebBluetoothGATTOperationOutcome" expires_after="2021-01-31">
-  <obsolete>
-    Removed 2021/04/09. crbug.com/1160798
-  </obsolete>
-  <owner>ortuno@chromium.org</owner>
-  <owner>reillyg@chromium.org</owner>
+    enum="WebBluetoothGATTOperationOutcome" expires_after="M97">
+  <owner>cmumford@chromium.org</owner>
+  <owner>deviceapi-team@google.com</owner>
   <summary>
     Records the outcome of a call to characteristic.startNofications(). Used to
     know what types of errors users are seeing. The results will be used to
@@ -355,12 +349,9 @@
 </histogram>
 
 <histogram name="Bluetooth.Web.Characteristic.WriteValue.Outcome"
-    enum="WebBluetoothGATTOperationOutcome" expires_after="2021-01-31">
-  <obsolete>
-    Removed 2021/04/09. crbug.com/1052936
-  </obsolete>
-  <owner>ortuno@chromium.org</owner>
-  <owner>reillyg@chromium.org</owner>
+    enum="WebBluetoothGATTOperationOutcome" expires_after="M97">
+  <owner>cmumford@chromium.org</owner>
+  <owner>deviceapi-team@google.com</owner>
   <summary>
     Records the outcome of a call to characteristic.writeValue(). Used to know
     what types of errors users are seeing. The results will be used to determine
diff --git a/tools/metrics/histograms/histograms_xml/content/histograms.xml b/tools/metrics/histograms/histograms_xml/content/histograms.xml
index da5ba13..cd6022b 100644
--- a/tools/metrics/histograms/histograms_xml/content/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/content/histograms.xml
@@ -1350,55 +1350,62 @@
   <owner>feed@chromium.org</owner>
   <summary>
     Time between the UI requesting additional stream content and the content
-    being provided within 15 seconds.
+    being provided within 15 seconds. Providing content entails showing either a
+    cached or newly fetched Feed card.
   </summary>
 </histogram>
 
-<histogram name="ContentSuggestions.Feed.UserJourney.OpenCard.Failure"
+<histogram name="ContentSuggestions.Feed.UserJourney.{Surface}.Failure"
     enum="Boolean" expires_after="2022-03-01">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <summary>
-    Reported when a user taps on a Feed card unless the page is not loaded
+    Reported when a user taps on a {Surface} card and the page is not loaded
     successfully within 20 seconds.
   </summary>
+  <token key="Surface">
+    <variant name="OpenCard" summary="For-You Feed"/>
+    <variant name="OpenCard.WebFeed" summary="Web Feed"/>
+  </token>
 </histogram>
 
-<histogram name="ContentSuggestions.Feed.UserJourney.OpenCard.SuccessDuration"
+<histogram name="ContentSuggestions.Feed.UserJourney.{Surface}.SuccessDuration"
     units="ms" expires_after="2022-03-01">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <summary>
-    The time between a user tapping on a Feed card and the page finishes loading
-    successfully. Only reported when loading takes less than 20 seconds.
+    The time between a user tapping on a {Surface} card and the page finishes
+    loading successfully. Only reported when loading takes less than 20 seconds.
   </summary>
+  <token key="Surface">
+    <variant name="OpenCard" summary="For-You Feed"/>
+    <variant name="OpenCard.WebFeed" summary="Web Feed"/>
+  </token>
 </histogram>
 
-<histogram name="ContentSuggestions.Feed.UserJourney.OpenFeed.FailureDuration"
+<histogram
+    name="ContentSuggestions.Feed.UserJourney.{Surface}.{Status}Duration"
     units="ms" expires_after="2022-03-01">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <summary>
-    The time between a Feed surface opening and failing to provide the user
-    content. This is reported when either the surface is closed or a timeout of
-    15 seconds expires.
+    The time between a {Surface} opening and either providing user content, or
+    failing to provide content. Providing content entails showing either a
+    cached or newly fetched Feed card within 15 seconds. Success is reported
+    upon view of the card. Failure is reported when either the surface is closed
+    or a timeout of 15 seconds expires.
   </summary>
-</histogram>
-
-<histogram name="ContentSuggestions.Feed.UserJourney.OpenFeed.SuccessDuration"
-    units="ms" expires_after="2022-03-01">
-  <owner>harringtond@chromium.org</owner>
-  <owner>carlosk@chromium.org</owner>
-  <owner>feed@chromium.org</owner>
-  <summary>
-    The time between a Feed surface opening and the user viewing the first
-    content. If this takes more than 15 seconds,
-    ContentSuggestions.Feed.UserJourney.OpenFeed.FailureDuration is reported
-    instead.
-  </summary>
+  <token key="Surface">
+    <variant name="OpenFeed" summary="For-You Feed"/>
+    <variant name="OpenFeed.WebFeed" summary="Web Feed"/>
+  </token>
+  <token key="Status">
+    <variant name="Failure" summary="Failure"/>
+    <variant name="Success" summary="Success"/>
+  </token>
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.VisitDuration" units="ms"
diff --git a/tools/metrics/histograms/histograms_xml/media/OWNERS b/tools/metrics/histograms/histograms_xml/media/OWNERS
index 3a0c450..eee8857 100644
--- a/tools/metrics/histograms/histograms_xml/media/OWNERS
+++ b/tools/metrics/histograms/histograms_xml/media/OWNERS
@@ -1,5 +1,6 @@
 per-file OWNERS=file://tools/metrics/histograms/histograms_xml/METRIC_REVIEWER_OWNERS
 
 # Use either chromium-metrics-reviews@google.com or the below owners.
-toyoshim@chromium.org
+evliu@google.com
 kron@chromium.org
+toyoshim@chromium.org
diff --git a/tools/metrics/histograms/histograms_xml/power/histograms.xml b/tools/metrics/histograms/histograms_xml/power/histograms.xml
index 80f39c9..91fec89 100644
--- a/tools/metrics/histograms/histograms_xml/power/histograms.xml
+++ b/tools/metrics/histograms/histograms_xml/power/histograms.xml
@@ -22,8 +22,8 @@
 <histograms>
 
 <variants name="UsageScenario">
-<!-- 
-Also used in tools/metrics/histograms/histograms_xml/others/histograms.xml 
+<!--
+Also used in tools/metrics/histograms/histograms_xml/others/histograms.xml
   When changing this variant changes need to verified against histograms there.
 -->
 
@@ -697,6 +697,34 @@
   </token>
 </histogram>
 
+<histogram name="Power.FrameDamageAreaInDip.{ProcessType}" units="dip"
+    expires_after="M98">
+  <owner>eseckler@chromium.org</owner>
+  <owner>skyostil@chromium.org</owner>
+  <summary>
+    Damaged area of a LayerTree's CompositorFrame in device-independent pixels.
+    Recorded every time a new frame is produced.
+  </summary>
+  <token key="ProcessType">
+    <variant name="Browser"/>
+    <variant name="Renderer"/>
+  </token>
+</histogram>
+
+<histogram name="Power.FrameDamageDiagonalInDip.{ProcessType}" units="dip"
+    expires_after="M98">
+  <owner>eseckler@chromium.org</owner>
+  <owner>skyostil@chromium.org</owner>
+  <summary>
+    Diagonal length of the damaged area of a LayerTree's CompositorFrame in
+    device-independent pixels. Recorded every time a new frame is produced.
+  </summary>
+  <token key="ProcessType">
+    <variant name="Browser"/>
+    <variant name="Renderer"/>
+  </token>
+</histogram>
+
 <histogram name="Power.IdleScreenDimCountDaily" units="count"
     expires_after="M100">
   <owner>tbroch@chromium.org</owner>
diff --git a/tools/metrics/metrics_python_tests.py b/tools/metrics/metrics_python_tests.py
index ddd3eb6..209d3780a 100755
--- a/tools/metrics/metrics_python_tests.py
+++ b/tools/metrics/metrics_python_tests.py
@@ -21,22 +21,33 @@
 
 
 sys.exit(
-    typ.main(tests=resolve(
-        'actions/extract_actions_test.py',
-        'histograms/expand_owners_unittest.py',
-        'histograms/extract_histograms_test.py',
-        'histograms/generate_expired_histograms_array_unittest.py',
-        'histograms/pretty_print_test.py',
-        'ukm/codegen_test.py',
-        'ukm/gen_builders_test.py',
-        'ukm/ukm_model_test.py',
-        'ukm/xml_validations_test.py',
-        '../json_comment_eater/json_comment_eater_test.py',
-        '../json_to_struct/element_generator_test.py',
-        '../json_to_struct/struct_generator_test.py',
-        '../variations/fieldtrial_to_struct_unittest.py',
-        '../variations/fieldtrial_util_unittest.py',
-        '../variations/split_variations_cmd_unittest.py',
-        '../../components/variations/service/'
-        'generate_ui_string_overrider_unittest.py',
-    )))
+    typ.main(
+        tests=resolve(
+            'actions/extract_actions_test.py',
+
+            # TODO(crbug.com/1220251) - the test ordering is very sensitive due to
+            # potential name collisions between ukm/pretty_print.py and
+            # histograms/pretty_print.py and the implementation in typ.
+            #
+            # Until this issue is fixed, best to ensure that the 'histograms' files
+            # show up *after* the 'ukm' files (in order for the histograms
+            # directory to be added to sys.path *before* ukm), and that we run the
+            # tests in a single process (jobs=1, below).
+            'ukm/codegen_test.py',
+            'ukm/gen_builders_test.py',
+            'ukm/ukm_model_test.py',
+            'ukm/xml_validations_test.py',
+            'histograms/expand_owners_unittest.py',
+            'histograms/extract_histograms_test.py',
+            'histograms/generate_expired_histograms_array_unittest.py',
+            'histograms/pretty_print_test.py',
+            '../json_comment_eater/json_comment_eater_test.py',
+            '../json_to_struct/element_generator_test.py',
+            '../json_to_struct/struct_generator_test.py',
+            '../variations/fieldtrial_to_struct_unittest.py',
+            '../variations/fieldtrial_util_unittest.py',
+            '../variations/split_variations_cmd_unittest.py',
+            '../../components/variations/service/'
+            'generate_ui_string_overrider_unittest.py',
+        ),
+        jobs=1))
diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json
index 18892d4..ab2d132 100644
--- a/tools/perf/core/perfetto_binary_roller/binary_deps.json
+++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json
@@ -1,16 +1,16 @@
 {
     "trace_processor_shell": {
         "win": {
-            "hash": "35d01e33d863bfcced1ee629e1fee54172f4d5c6",
-            "remote_path": "perfetto_binaries/trace_processor_shell/win/73cf27bf1244cc6d8605f4c4ba0840831908a6f5/trace_processor_shell.exe"
+            "hash": "022c89621a6149a651525df62d68cac5a55bf68e",
+            "remote_path": "perfetto_binaries/trace_processor_shell/win/bb16fa2cc0a03db867a1977c68d87efe7d7e26be/trace_processor_shell.exe"
         },
         "mac": {
-            "hash": "848fd8e2530e7f5d051fb2f68d88576e54584226",
-            "remote_path": "perfetto_binaries/trace_processor_shell/mac/73cf27bf1244cc6d8605f4c4ba0840831908a6f5/trace_processor_shell"
+            "hash": "ed0346b59fb7f24b052b52e199cfd5525028dded",
+            "remote_path": "perfetto_binaries/trace_processor_shell/mac/8b07d9bbd00bbc938dc5e81bea6f4e99087b54fe/trace_processor_shell"
         },
         "linux": {
-            "hash": "f53ee2344b927a71d608cdac8acc7e7493593066",
-            "remote_path": "perfetto_binaries/trace_processor_shell/linux/73cf27bf1244cc6d8605f4c4ba0840831908a6f5/trace_processor_shell"
+            "hash": "2f603ae27a8ffa6005dd43b0d0dd4f5e75b9bc97",
+            "remote_path": "perfetto_binaries/trace_processor_shell/linux/731dcf8b1cbead0b4ab422d5d119644fb5ab60d8/trace_processor_shell"
         }
     },
     "power_profile.sql": {