OWNERS and WATCHLISTS updates:

- Remove zentaro@ (leaving Google)
- Add one peripherals team member (maintain minimum of two owners
  where applicable)

Bug: n/a
Change-Id: I793d7f66ca580d73eef000d507438ca31e9265a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5828580
Reviewed-by: Anqing Zhao <anqing@chromium.org>
Reviewed-by: Wenyu Zhang <zhangwenyu@google.com>
Reviewed-by: Caitlin Fischer <caitlinfischer@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Xiangdong Kong <xiangdongkong@google.com>
Reviewed-by: David Padlipsky <dpad@google.com>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: Jimmy Gong <jimmyxgong@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1352080}

WATCHLISTS

@@ -2426,8 +2426,7 @@
   'WATCHLISTS': {
     'about_flags': ['asvitkine+watch@chromium.org',
                     'jmedley+watch@chromium.org'],
-    'accelerators': ['zentaro+watch-accelerators@chromium.org',
-                     'jimmyxgong+watch-accelerators@chromium.org',
+    'accelerators': ['jimmyxgong+watch-accelerators@chromium.org',
                      'cambickel+watch-accelerators@google.com',
                      'longbowei+watch-accelerators@google.com',
                      'zhangwenyu+watch-accelerators@google.com',
@@ -2518,8 +2517,7 @@
                 'jasongustaman+watch-arc-net@chromium.org'],
     'arc_power': ['ejcaruso+watch@chromium.org'],
     'ash_webui_common': ['gavinwill+watch-ash-webui-common@chromium.org',
-                         'jimmyxgong+watch-ash-webui-common@chromium.org',
-                         'zentaro+watch-ash-webui-common@chromium.org'],
+                         'jimmyxgong+watch-ash-webui-common@chromium.org'],
     'ash_wm_desks': ['dandersson@chromium.org',
                      'bicioglu@google.com'],
     'assistive': ['croissant-eng+reviews@chromium.org'],
@@ -2871,12 +2869,10 @@
     'diagnostics_mojo': ['ashleydp+watch-diagnostics_mojo@google.com',
                          'gavindodd+watch-diagnostics_mojo@google.com',
                          'michaelcheco+watch-diagnostics_mojo@google.com',
-                         'zentaro+watch-diagnostics_mojo@chromium.org',
                          'dpad+watch-diagnostics_mojo@google.com',
                          'zhangwenyu+watch-diagnostics_mojo@google.com'],
     'diagnostics_ui': ['gavinwill+diagnostics-watch@chromium.org',
                        'michaelcheco+diagnostics-watch@google.com',
-                       'zentaro+diagnostics-watch@chromium.org',
                        'gavindodd+diagnostics-watch@google.com',
                        'ashleydp+diagnostics-watch@google.com',
                        'dpad+diagnostics-watch@google.com',
@@ -2921,8 +2917,7 @@
     'fileapi': ['kinuko+fileapi@chromium.org'],
     'filebrowse': ['rginda+watch@chromium.org'],
     'filesapp': ['filesapp-reviews@chromium.org'],
-    'firmware_update': ['zentaro+firmware-watch@chromium.org',
-                        'jimmyxgong+firmware-watch@chromium.org',
+    'firmware_update': ['jimmyxgong+firmware-watch@chromium.org',
                         'michaelcheco+firmware-watch@google.com'],
     'float': ['toshikikikuchi+watch-float@chromium.org'],
     'freetype_update': ['drott+watch@chromium.org',
@@ -3192,7 +3187,6 @@
     'remoting': ['chromoting-reviews@chromium.org'],
     'rgb_kbd': ['michaelcheco+watch-rgb-kbd@google.com',
                 'jimmyxgong+watch-rgb-kbd@chromium.org',
-                'zentaro+watch-rgb-kbd@chromium.org',
                 'dpad+watch-rgb-kbd@google.com'],
     'rlz_id': ['gab+watch@chromium.org',
                'robertshield+watch@chromium.org'],
@@ -3205,8 +3199,7 @@
                       'xinghuilu+watch@chromium.org',
                       'zackhan+watch@chromium.org'],
     'sampling_profiler': ['wittman+watch@chromium.org'],
-    'scanning': ['gavinwill+scanning-watch@chromium.org',
-                 'zentaro+scanning-watch@chromium.org'],
+    'scanning': ['gavinwill+scanning-watch@chromium.org'],
     'screen_ai': ['rhalavati+watch@chromium.org'],
     'search_engine_choice_screen': ['chrome-waffle-eng+watch@google.com'],
     'search_prefetch': ['lingqi+watch@chromium.org'],
@@ -3227,8 +3220,7 @@
     'settings_os_settings_languages':
         ['mlcui+watch-os-settings-languages@google.com'],
     'sharing': ['knollr+watch-sharing@chromium.org'],
-    'shimless_rma': ['zentaro+watch-shimless@chromium.org',
-                     'jimmyxgong+watch-shimless@chromium.org',
+    'shimless_rma': ['jimmyxgong+watch-shimless@chromium.org',
                      'michaelcheco+watch-shimless@google.com'],
     'shortcut_customization_ui':
         ['jimmyxgong+watch-shortcut-customization-ui@chromium.org',

ash/accelerators/OWNERS

@@ -2,4 +2,3 @@ afakhry@chromium.org
 dpad@google.com
 hidehiko@chromium.org
 jimmyxgong@chromium.org
-zentaro@chromium.org

ash/events/OWNERS

@@ -1,7 +1,7 @@
 per-file accessibility_event_rewriter*=file://ash/accessibility/OWNERS
 per-file select_to_speak_event_handler*=file://ash/accessibility/OWNERS
-per-file keyboard_capability*=zentaro@chromium.org,dpad@google.com
-per-file peripheral_customization*=zentaro@chromium.org,dpad@google.com
-per-file prerewritten_event_forwarder*=zentaro@chromium.org,dpad@google.com,jimmyxgong@chromium.org
+per-file keyboard_capability*=jimmyxgong@chromium.org,dpad@google.com
+per-file peripheral_customization*=jimmyxgong@chromium.org,dpad@google.com
+per-file prerewritten_event_forwarder*=dpad@google.com,jimmyxgong@chromium.org
 hidehiko@chromium.org
 

ash/rgb_keyboard/OWNERS

@@ -1,4 +1,3 @@
 jimmyxgong@chromium.org
 michaelcheco@google.com
-zentaro@chromium.org
 dpad@google.com

ash/system/OWNERS

@@ -4,9 +4,7 @@ leandre@chromium.org
 newcomer@chromium.org
 tbarzic@chromium.org
 
-per-file caps_lock_notification_controller*=zentaro@chromium.org
 per-file caps_lock_notification_controller*=jimmyxgong@chromium.org
 per-file caps_lock_notification_controller*=dpad@google.com
-per-file *brightness*=zentaro@chromium.org
 per-file *brightness*=jimmyxgong@chromium.org
 per-file *brightness*=dpad@google.com

ash/system/firmware_update/OWNERS

@@ -1,2 +1,2 @@
 jimmyxgong@chromium.org
-zentaro@chromium.org
+gavinwill@chromium.org

ash/system/keyboard_brightness/OWNERS

@@ -1,4 +1,3 @@
 jasontt@chromium.org
 jimmyxgong@chromium.org
 dpad@google.com
-zentaro@chromium.org

ash/system/pcie_peripheral/OWNERS

@@ -1,2 +1,2 @@
 jimmyxgong@chromium.org
-zentaro@chromium.org
+dpad@google.com

ash/system/usb_peripheral/OWNERS

@@ -1,2 +1,2 @@
 jimmyxgong@chromium.org
-zentaro@chromium.org
+dpad@google.com

ash/webui/common/OWNERS

@@ -1,8 +1,8 @@
 # Primary OWNERS
 jimmyxgong@chromium.org
-zentaro@chromium.org
 gavinwill@chromium.org
 michaelcheco@google.com
 ashleydp@google.com
+xiangdongkong@google.com
 
 per-file sea_pen_*=file://ash/webui/personalization_app/OWNERS

ash/webui/firmware_update_ui/OWNERS

@@ -1,4 +1,3 @@
 # Primary OWNERS
 jimmyxgong@chromium.org
-zentaro@chromium.org
-michaelcheco@google.com
+michaelcheco@google.com

ash/webui/firmware_update_ui/mojom/OWNERS

@@ -1,5 +1,4 @@
 jimmyxgong@chromium.org
-zentaro@chromium.org
 michaelcheco@google.com
 
 per-file *.mojom=set noparent

ash/webui/os_feedback_ui/OWNERS

@@ -4,4 +4,4 @@ gavinwill@chromium.org
 jimmyxgong@chromium.org
 
 # Backup OWNERS
-zentaro@chromium.org
+zhangwenyu@google.com

ash/webui/print_management/OWNERS

@@ -4,4 +4,3 @@ jimmyxgong@chromium.org
 
 # Backup OWNERS
 khorimoto@chromium.org
-zentaro@chromium.org

ash/webui/print_preview_cros/OWNERS

@@ -4,4 +4,4 @@ jimmyxgong@chromium.org
 ashleydp@google.com
 
 # Backup OWNERS
-zentaro@chromium.org
+xiangdongkong@google.com

ash/webui/scanning/OWNERS

@@ -1,7 +1,6 @@
 # Primary OWNERS
 gavinwill@chromium.org
 jimmyxgong@chromium.org
-zentaro@chromium.org
 michaelcheco@google.com
 
 # Backup OWNERS

ash/webui/shimless_rma/OWNERS

@@ -2,6 +2,5 @@
 gavinwill@chromium.org
 
 # Backup OWNERS
-zentaro@chromium.org
 jimmyxgong@chromium.org
-cambickel@google.com
+cambickel@google.com

ash/webui/shortcut_customization_ui/OWNERS

@@ -2,5 +2,4 @@
 jimmyxgong@chromium.org
 michaelcheco@google.com
 longbowei@google.com
-zentaro@chromium.org
 cambickel@google.com

ash/webui/shortcut_customization_ui/backend/search/OWNERS

@@ -1,6 +1,5 @@
 jimmyxgong@chromium.org
 longbowei@google.com
-zentaro@chromium.org
 cambickel@google.com
 
 per-file *.mojom=set noparent

ash/webui/shortcut_customization_ui/mojom/OWNERS

@@ -1,6 +1,5 @@
 jimmyxgong@chromium.org
 longbowei@google.com
-zentaro@chromium.org
 cambickel@google.com
 
 per-file *.mojom=set noparent

chrome/browser/ash/events/OWNERS

@@ -1,4 +1,4 @@
-zentaro@chromium.org
+jimmyxgong@chromium.org
 dpad@google.com
 
 per-file *event_rewriter* = kpschoedel@chromium.org

chrome/browser/ash/pcie_peripheral/OWNERS

@@ -1,2 +1,2 @@
 jimmyxgong@chromium.org
-zentaro@chromium.org
+dpad@google.com

chrome/browser/ash/printing/print_preview/OWNERS

@@ -5,4 +5,4 @@ gavinwill@chromium.org
 dpad@google.com
 
 # Secondary OWNERS
-zentaro@chromium.org
+xiangdongkong@google.com

chrome/browser/chromeos/printing/print_preview/OWNERS

@@ -5,4 +5,4 @@ gavinwill@chromium.org
 dpad@google.com
 
 # Secondary OWNERS
-zentaro@chromium.org
+xiangdongkong@google.com

chrome/browser/flag-metadata.json

@@ -471,7 +471,7 @@
   {
     "name": "ash-modifier-split",
     "owners": [
-      "dpad@chromium.org",
+      "dpad@google.com",
       "wangdanny@chromium.org",
       "cros-peripherals@google.com"
     ],
@@ -479,7 +479,10 @@
   },
   {
     "name": "ash-modifier-split-feature-key",
-    "owners": [ "dpad@chromium.org", "cros-peripherals@google.com" ],
+    "owners": [
+      "dpad@google.com",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {
@@ -518,7 +521,7 @@
   {
     "name": "ash-split-keyboard-refactor",
     "owners": [
-      "dpad@chromium.org",
+      "dpad@google.com",
       "cros-peripherals@google.com"
     ],
     "expiry_milestone": 131
@@ -2007,14 +2010,19 @@
   },
   {
     "name": "deprecate-alt-click",
-    "owners": [ "zentaro@google.com", "jimmyxgong@google.com",
-                "cros-peripherals@google.com"],
+    "owners": [
+      "jimmyxgong@chromium.org",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {
     "name": "deprecate-old-keyboard-shortcuts-accelerator",
-    "owners": [ "zentaro@chromium.org", "jimmyxgong@chromium.org", "cambickel@chromium.org",
-                "cros-peripherals@google.com"],
+    "owners": [
+      "jimmyxgong@chromium.org",
+      "cambickel@chromium.org",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 130
   },
   {
@@ -2601,7 +2609,11 @@
   },
   {
     "name": "enable-brightness-control-in-settings",
-    "owners": [ "cambickel@google.com", "zentaro@chromium.org", "cros-peripherals@google.com" ],
+    "owners": [
+      "cambickel@google.com",
+      "longbowei@google.com",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 130
   },
   {
@@ -3085,7 +3097,11 @@
   },
   {
     "name": "enable-experimental-rgb-keyboard-patterns",
-    "owners": [ "jimmyxgong@chromium.org", "zentaro@chromium.org", "michaelcheco@chromium.org", "cros-peripherals@google.com"],
+    "owners": [
+      "jimmyxgong@chromium.org",
+      "michaelcheco@chromium.org",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {
@@ -3359,7 +3375,10 @@
   },
   {
     "name": "enable-input-device-settings-split",
-    "owners": ["dpad@chromium.org", "zentaro@chromium.org", "cros-peripherals@google.com"],
+    "owners": [
+      "dpad@google.com",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {
@@ -3435,7 +3454,11 @@
   },
   {
     "name": "enable-keyboard-backlight-control-in-settings",
-    "owners": [ "dpad@chromium.org", "longbowei@google.com", "cros-peripherals@google.com" ],
+    "owners": [
+      "dpad@google.com",
+      "longbowei@google.com",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {
@@ -3691,18 +3714,24 @@
   },
   {
     "name": "enable-peripheral-customization",
-    "owners": ["dpad@chromium.org", "zentaro@chromium.org", "cros-peripherals@google.com"],
+    "owners": [
+      "dpad@google.com",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 130
   },
   {
     "name": "enable-peripheral-notification",
-    "owners": ["dpad@chromium.org", "zentaro@chromium.org", "cros-peripherals@google.com"],
+    "owners": [
+      "dpad@google.com",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 130
   },
   {
     "name": "enable-peripherals-logging",
     "owners": [
-      "dpad@chromium.org",
+      "dpad@google.com",
       "jimmyxgong@chromium.org",
       "cros-peripherals@google.com"
     ],
@@ -3903,7 +3932,10 @@
   },
   {
     "name": "enable-shortcut-customization",
-    "owners": [ "jimmyxgong@chromium.org", "zentaro@chromium.org", "cros-peripherals@google.com"],
+    "owners": [
+      "jimmyxgong@chromium.org",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 130
   },
   {
@@ -3977,7 +4009,7 @@
   {
     "name": "enable-suspend-state-machine",
     "owners": [
-      "dpad@chromium.org",
+      "dpad@google.com",
       "cros-peripherals@google.com"
     ],
     "expiry_milestone": 140
@@ -5194,8 +5226,10 @@
   },
   {
     "name": "improved-keyboard-shortcuts",
-    "owners": [ "zentaro@google.com", "jimmyxgong@google.com",
-                "cros-peripherals@google.com"],
+    "owners": [
+      "jimmyxgong@chromium.org",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {
@@ -7704,7 +7738,10 @@
   },
   {
     "name": "reset-shortcut-customizations",
-    "owners": [ "jimmyxgong@chromium.org", "zentaro@chromium.org", "cros-peripherals@google.com"],
+    "owners": [
+      "jimmyxgong@chromium.org",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {
@@ -8049,7 +8086,10 @@
   },
   {
     "name": "shimless-rma-os-update",
-    "owners": [ "zentaro@chromium.org", "gavinwill@chromium.org", "cros-peripherals@google.com" ],
+    "owners": [
+      "gavinwill@chromium.org",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {
@@ -8997,7 +9037,10 @@
   },
   {
     "name": "use-search-click-for-right-click",
-    "owners": [ "zentaro@chromium.org", "jimmyxgong@chromium.org", "cros-peripherals@google.com" ],
+    "owners": [
+      "jimmyxgong@chromium.org",
+      "cros-peripherals@google.com"
+    ],
     "expiry_milestone": 140
   },
   {

chrome/browser/resources/ash/settings/device_page/OWNERS

@@ -1,6 +1,5 @@
 jimmyxgong@chromium.org
-zentaro@chromium.org
 michaelcheco@google.com
 dpad@google.com
 gavinwill@chromium.org
-zhangwenyu@google.com
+zhangwenyu@google.com

chrome/test/data/webui/chromeos/os_feedback_ui/OWNERS

@@ -4,4 +4,3 @@ xiangdongkong@google.com
 # Backup OWNERS
 gavinwill@chromium.org
 jimmyxgong@chromium.org
-zentaro@chromium.org

chromeos/ash/components/audio/OWNERS

@@ -8,5 +8,4 @@ file://chrome/browser/ash/audio/OWNERS
 per-file cros_audio_config*=ashleydp@google.com
 per-file cros_audio_config*=gavinwill@chromium.org
 per-file cros_audio_config*=michaelcheco@google.com
-per-file cros_audio_config*=zentaro@chromium.org
 per-file cros_audio_config*=zhangwenyu@google.com

chromeos/ash/components/dbus/fwupd/OWNERS

@@ -1,3 +1,2 @@
 jimmyxgong@chromium.org
 dpad@google.com
-zentaro@chromium.org

chromeos/ash/components/dbus/pciguard/OWNERS

@@ -1,3 +1,3 @@
 # Primary Owners
 jimmyxgong@chromium.org
-zentaro@chromium.org
+dpad@google.com

chromeos/ash/components/dbus/rgbkbd/OWNERS

@@ -1,3 +1,2 @@
-zentaro@chromium.org
 jimmyxgong@chromium.org
 michaelcheco@google.com

chromeos/ash/components/dbus/rmad/OWNERS

@@ -3,4 +3,3 @@ gavinwill@chromium.org
 
 # Backup OWNERS
 jimmyxgong@chromium.org
-zentaro@chromium.org

chromeos/ash/components/dbus/typecd/OWNERS

@@ -1,3 +1,3 @@
 # Primary Owners
 jimmyxgong@chromium.org
-zentaro@chromium.org
+dpad@google.com

chromeos/ash/components/fwupd/OWNERS

@@ -1,3 +1,2 @@
 jimmyxgong@chromium.org
 dpad@google.com
-zentaro@chromium.org

chromeos/ash/components/scanning/OWNERS

@@ -1,3 +1,3 @@
 gavinwill@chromium.org
 bmgordon@chromium.org
-zentaro@chromium.org
+jimmyxgong@chromium.org

chromeos/components/OWNERS

@@ -2,7 +2,6 @@ chadduffin@chromium.org
 gavinwill@chromium.org
 khorimoto@chromium.org
 jimmyxgong@chromium.org
-zentaro@chromium.org
 
 # This is for the common case of adding or renaming files. If you're doing
 # structural changes, use usual OWNERS rules.

chromeos/components/print_management/mojom/OWNERS

@@ -4,7 +4,7 @@ jimmyxgong@chromium.org
 khorimoto@chromium.org
 
 # Secondary Owners
-zentaro@chromium.org
+xiangdongkong@google.com
 
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS

chromeos/dbus/OWNERS

@@ -1,3 +1,2 @@
 stevenjb@chromium.org
 hashimoto@chromium.org
-zentaro@chromium.org

chromeos/dbus/power/OWNERS

@@ -1,5 +1,5 @@
 dpad@google.com
-zentaro@chromium.org
+jimmyxgong@chromium.org
 
 # Non-committers (can do the primary review, but an OWNER is still required)
 # Commented out so that gerrit does not select them as owner reviewers.

chromeos/printing/OWNERS

@@ -4,4 +4,4 @@ pawliczek@chromium.org
 
 # Backup OWNERS
 thestig@chromium.org
-zentaro@chromium.org
+jimmyxgong@chromium.org

components/feedback/OWNERS

@@ -3,5 +3,4 @@ xiangdongkong@google.com
 jimmyxgong@chromium.org
 
 # Backup OWNERS
-zentaro@chromium.org
 afakhry@chromium.org

components/policy/resources/templates/policy_definitions/Miscellaneous/DeviceI18nShortcutsEnabled.yaml

@@ -23,7 +23,6 @@ items:
   value: false
 owners:
 - jimmyxgong@chromium.org
-- zentaro@chromium.org
 - cros-peripheral@google.com
 schema:
   type: boolean

components/policy/resources/templates/policy_definitions/Miscellaneous/ShortcutCustomizationAllowed.yaml

@@ -12,7 +12,6 @@ features:
   per_profile: false
 owners:
 - jimmyxgong@chromium.org
-- zentaro@chromium.org
 - cros-peripheral@google.com
 items:
 - caption: Allow the user to customize system shortcuts
@@ -24,4 +23,4 @@ schema:
 supported_on:
 - chrome_os:123-
 tags: []
-type: main
+type: main

components/policy/resources/templates/policy_definitions/Printing/NativePrintersBulkAccessMode.yaml

@@ -18,8 +18,9 @@ items:
   value: 2
 owners:
 - file://chromeos/printing/OWNERS
-- zentaro@chromium.org
+- jimmyxgong@chromium.org
 - skau@chromium.org
+- cros-peripheral@google.com
 schema:
   enum:
   - 0

components/policy/resources/templates/policy_definitions/Printing/PrintersBulkAccessMode.yaml

@@ -26,8 +26,9 @@ items:
   value: 2
 owners:
 - file://chromeos/printing/OWNERS
-- zentaro@chromium.org
+- jimmyxgong@chromium.org
 - thestig@chromium.org
+- cros-peripheral@google.com
 schema:
   enum:
   - 0

third_party/d3/OWNERS

@@ -1,2 +1,2 @@
-zentaro@chromium.org
+jimmyxgong@chromium.org
 dpapad@chromium.org

tools/metrics/actions/actions.xml

@@ -2586,7 +2586,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="AltBasedKeyRewrite_Delete">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Alt+Backspace to produce the Delete key.
@@ -2594,7 +2594,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="AltBasedKeyRewrite_End">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Alt+Ctrl+DownArrow to produce the End key.
@@ -2602,7 +2602,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="AltBasedKeyRewrite_Home">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Alt+Ctrl+UpArrow to produce the Home key.
@@ -2610,7 +2610,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="AltBasedKeyRewrite_PageDown">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Alt+DownArrow to produce the PageDown key.
@@ -2618,13 +2618,14 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="AltBasedKeyRewrite_PageUp">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Alt+UpArrow to produce the PageUp key.</description>
 </action>
 
 <action name="AltClickMappedToRightClick">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
+  <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed alt click on a touchpad device to generate right click.
   </description>
@@ -6272,7 +6273,7 @@ should be able to be added at any place in this file.
 
 <action name="CapsLock_Toggled">
   <owner>dpad@google.com</owner>
-  <owner>zentaro@google.com</owner>
+  <owner>jimmyxgong@chromium.org</owner>
   <description>
     User toggled capslock via capslock key press or keyboard shortcut (alt +
     search).
@@ -6281,7 +6282,7 @@ should be able to be added at any place in this file.
 
 <action name="CapsLock_Toggled_Using_CapsLockKey">
   <owner>dpad@google.com</owner>
-  <owner>zentaro@google.com</owner>
+  <owner>jimmyxgong@chromium.org</owner>
   <description>User toggled capslock via capslock key press.</description>
 </action>
 
@@ -32995,7 +32996,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SearchBasedKeyRewrite_Delete">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Search+Backspace to produce the Delete key.
@@ -33003,7 +33004,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SearchBasedKeyRewrite_End">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Search+RightArrow to produce the End key.
@@ -33011,7 +33012,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SearchBasedKeyRewrite_Home">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Search+LeftArrow to produce the Home key.
@@ -33019,7 +33020,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SearchBasedKeyRewrite_Insert">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Search+Period to produce the Insert key.
@@ -33027,7 +33028,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SearchBasedKeyRewrite_PageDown">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Search+DownArrow to produce the PageDown key.
@@ -33035,7 +33036,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SearchBasedKeyRewrite_PageUp">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed Search+UpArrow to produce the PageUp key.
@@ -33043,7 +33044,8 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SearchClickMappedToRightClick">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
+  <owner>jimmyxgong@chromium.org</owner>
   <description>
     User pressed search click on a touchpad device to generate right click. This
     is measuring the transition of use from the legacy alt click behaviour that
@@ -33128,73 +33130,73 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SearchPlusDigitRewrite_F1">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+1 to produce the F1 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F10">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+0 to produce the F10 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F11">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+Minus to produce the F11 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F12">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+Equals to produce the F12 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F2">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+2 to produce the F2 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F3">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+3 to produce the F3 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F4">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+4 to produce the F4 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F5">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+5 to produce the F5 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F6">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+6 to produce the F6 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F7">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+7 to produce the F7 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F8">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+8 to produce the F8 key.</description>
 </action>
 
 <action name="SearchPlusDigitRewrite_F9">
-  <owner>zentaro@chromium.org</owner>
+  <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
   <description>User pressed Search+9 to produce the F9 key.</description>
 </action>

tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS

@@ -30,7 +30,6 @@ dmblack@google.com
 # ash
 tby@chromium.org
 jimmyxgong@chromium.org
-zentaro@chromium.org
 yulunwu@chromium.org
 michelefan@chromium.org
 # ash_growth
@@ -86,7 +85,6 @@ tby@chromium.org
 tsergeant@chromium.org
 jimmyxgong@chromium.org
 gavinwill@chromium.org
-zentaro@chromium.org
 # chromeos
 azeemarshad@chromium.org
 chadduffin@chromium.org
@@ -100,7 +98,6 @@ khorimoto@chromium.org
 nikhilcn@google.com
 tjohnsonkanu@google.com
 tsergeant@chromium.org
-zentaro@chromium.org
 # chromeos_settings
 xiaohuic@chromium.org
 # chrome
@@ -153,7 +150,7 @@ tbansal@chromium.org
 changhaohan@chromium.org
 # diagnostics
 jimmyxgong@chromium.org
-zentaro@chromium.org
+gavinwill@chromium.org
 # direct
 schenney@chromium.org
 # download
@@ -302,7 +299,7 @@ sophiechang@chromium.org
 tbansal@chromium.org
 # others
 jimmyxgong@chromium.org
-zentaro@chromium.org
+gavinwill@chromium.org
 johnidel@chromium.org
 jonross@chromium.org
 dullweber@chromium.org
@@ -359,7 +356,7 @@ spelchat@chromium.org
 # printing
 awscreen@chromium.org
 jimmyxgong@chromium.org
-zentaro@chromium.org
+gavinwill@chromium.org
 # privacy_budget
 antoniosartori@chromium.org
 # privacy
@@ -396,7 +393,7 @@ thefrog@chromium.org
 xinghuilu@chromium.org
 # scanning
 jimmyxgong@chromium.org
-zentaro@chromium.org
+gavinwill@chromium.org
 # scheduler
 altimin@chromium.org
 spvw@chromium.org

tools/metrics/histograms/metadata/ash/histograms.xml

@@ -497,7 +497,7 @@ chromium-metrics-reviews@google.com.
 
 <histogram name="Ash.Accelerators.Rotation.Usage"
     enum="ScreenRotationAcceleratorAction" expires_after="2023-10-08">
-  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Captures the result of a user using the rotation accelerator -

tools/metrics/histograms/metadata/chromeos/histograms.xml

@@ -54,7 +54,6 @@ They are used for the ChromeOS.CertProvisioning.* histograms to distinguish
   <variant name="DiagnosticsUi" summary="CROS Diagnostics Application">
     <owner>zhangwenyu@google.com</owner>
     <owner>jimmyxgong@chromium.org</owner>
-    <owner>zentaro@chromium.org</owner>
     <owner>cros-peripherals@google.com</owner>
   </variant>
   <variant name="EnterpriseESim" summary="enterprise eSIM">
@@ -1130,7 +1129,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
     enum="CrosDiagnosticsCrosHealthdProbeError" expires_after="2024-10-20">
   <owner>zhangwenyu@google.com</owner>
   <owner>ashleydp@google.com</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the ProbeError::ErrorType returned on request for
@@ -1149,7 +1147,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
     enum="CrosDiagnosticsDataError" expires_after="2025-02-23">
   <owner>zhangwenyu@google.com</owner>
   <owner>ashleydp@google.com</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records error type such as no data error, not a number error and expectation
@@ -1168,7 +1165,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>zhangwenyu@google.com</owner>
   <owner>ashleydp@google.com</owner>
   <owner>gavinwill@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records requested initial screen when opening the Diagnostics App.
@@ -1180,7 +1176,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>zhangwenyu@google.com</owner>
   <owner>dpad@chromium.org</owner>
   <owner>michaelcheco@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the duration that the user spent in the Keyboard Tester. Emitted
@@ -1193,7 +1188,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>zhangwenyu@google.com</owner>
   <owner>ashleydp@google.com</owner>
   <owner>gavinwill@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the duration that the Memory Routine took to complete. Emitted when
@@ -1206,7 +1200,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>zhangwenyu@google.com</owner>
   <owner>ashleydp@google.com</owner>
   <owner>gavinwill@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the duration that the Diagnostics App is open. emitted when the app
@@ -1219,7 +1212,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>zhangwenyu@google.com</owner>
   <owner>ashleydp@google.com</owner>
   <owner>gavinwill@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the number of routines run while the Chrome OS Diagnostics App was
@@ -1233,7 +1225,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>zhangwenyu@google.com</owner>
   <owner>ashleydp@google.com</owner>
   <owner>gavinwill@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the duration that the Diagnostics App is open for a given page view.
@@ -1255,7 +1246,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>zhangwenyu@google.com</owner>
   <owner>ashleydp@google.com</owner>
   <owner>gavinwill@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>Records the result of the {RoutineType} Routine.</summary>
   <token key="RoutineType">
@@ -1295,7 +1285,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
     name="ChromeOS.Display.TimeUntilFirstBrightnessChange.{Time}.{BrightnessAction}Brightness.{PowerSource}Power"
     units="ms" expires_after="2025-03-01">
   <owner>cambickel@google.com</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     When a user {BrightnessAction} the brightness of the internal display for
@@ -1350,7 +1339,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
     units="ms" expires_after="2025-06-28">
   <owner>cambickel@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     When a firmware install fails while waiting for user action (i.e. a device
@@ -1365,7 +1353,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
     enum="FirmwareUpdateFwupdStatus" expires_after="2025-06-28">
   <owner>cambickel@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the most recent FwupdStatus when a firmware install fails for any
@@ -1377,7 +1364,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
     enum="FirmwareUpdateDeviceRequestID" expires_after="2025-06-28">
   <owner>cambickel@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the ID and {Kind} of request received from fwupd. A request is an
@@ -1397,7 +1383,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
     units="ms" expires_after="2025-06-28">
   <owner>cambickel@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the duration of a successful device request. Requests are considered
@@ -1411,7 +1396,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
 <histogram name="ChromeOS.FirmwareUpdateUi.{Method}Result"
     enum="FirmwareUpdateMethodResult" expires_after="2025-06-28">
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the result of a {Method} call. Recorded once per {Method} and the
@@ -1431,7 +1415,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
 <histogram name="ChromeOS.FirmwareUpdateUi.{Source}.DeviceCount"
     units="devices" expires_after="2025-06-28">
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the total number of devices found. OnStartup is recorded when a user
@@ -1452,7 +1435,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
 <histogram name="ChromeOS.FirmwareUpdateUi.{Source}.{Severity}UpdateCount"
     units="updates" expires_after="2025-06-28">
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records the total number of {Severity} firmware updates found for all of the
@@ -2834,7 +2816,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>michaelcheco@google.com</owner>
   <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records whether or not RGB keyboard is supported for the current device.
@@ -2850,7 +2831,6 @@ and mapped to the variant by `StatisticNameToMachineStatisticVariant()` -->
   <owner>michaelcheco@google.com</owner>
   <owner>dpad@google.com</owner>
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>Records the source of RGB backlight change for a device.</summary>
 <!-- This must be kept current with RgbKeyboardCapabilityType located in

tools/metrics/histograms/metadata/chromeos_settings/histograms.xml

@@ -263,7 +263,6 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="ChromeOS.Settings.Device.KeyboardFunctionKeys"
     enum="BooleanToggled" expires_after="2024-12-15">
   <owner>jimmyxgong@chromium.org</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records when a user changes the kKeyboardFunctionKeys setting on the Device
@@ -308,7 +307,6 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="ChromeOS.Settings.Display.Internal.AutoBrightnessEnabled"
     enum="BooleanToggled" expires_after="2025-03-01">
   <owner>cambickel@google.com</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records each time a user toggles the auto-brightness setting via the
@@ -319,7 +317,6 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="ChromeOS.Settings.Display.Internal.BrightnessSliderAdjusted"
     units="%" expires_after="2025-03-01">
   <owner>cambickel@google.com</owner>
-  <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Records each time a user changes the screen brightness for an internal

tools/metrics/histograms/metadata/others/OWNERS

@@ -8,7 +8,7 @@ per-file histograms.xml=file://tools/metrics/histograms/metadata/METRIC_REVIEWER
 # Primary reviewers
 jimmyxgong@chromium.org
 # Secondary reviewers
-zentaro@chromium.org
+gavinwill@chromium.org
 # For Conversions.* histograms:
 johnidel@chromium.org
 # For Compositor*, Gpu.*, Graphics* and Viz.* histograms:

tools/metrics/histograms/metadata/scanning/OWNERS

@@ -5,5 +5,3 @@ per-file OWNERS=file://tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS
 # Primary reviewers
 jimmyxgong@chromium.org
 gavinwill@chromium.org
-# Secondary reviewers
-zentaro@chromium.org

ui/base/accelerators/OWNERS

@@ -1 +1,2 @@
-zentaro@chromium.org
+jimmyxgong@chromium.org
+dpad@google.com

ui/events/ash/OWNERS

@@ -1,6 +1,6 @@
 file://ui/chromeos/OWNERS
 
 hidehiko@chromium.org
-zentaro@chromium.org
+jimmyxgong@chromium.org
 yhanada@chromium.org
 dpad@google.com