libchrome: update config for parallel-packages-checker

By running gen_config.py

BUG=None
TEST=None

Change-Id: Ibe1d7a502ae97edba671060a333f8b016c156372
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/libchrome/+/3954868
Reviewed-by: Qijiang Yūki Ishii <fqj@google.com>
Tested-by: Grace Cham <hscham@chromium.org>
Auto-Submit: Grace Cham <hscham@chromium.org>
Commit-Queue: Qijiang Yūki Ishii <fqj@google.com>
diff --git a/libchrome_tools/developer-tools/parallel-packages-checker/config.py b/libchrome_tools/developer-tools/parallel-packages-checker/config.py
index ec0f630..bbb5377 100644
--- a/libchrome_tools/developer-tools/parallel-packages-checker/config.py
+++ b/libchrome_tools/developer-tools/parallel-packages-checker/config.py
@@ -2,31 +2,28 @@
 
 ALL_BOARDS = [
     'amd64-generic', 'arm-generic', 'arm64-generic', 'asuka', 'asurada',
-    'atlas', 'banon', 'beaglebone', 'betty-arc-r', 'betty-arc-t',
+    'atlas', 'beaglebone', 'betty', 'betty-arc-r', 'betty-arc-t',
     'betty-pi-arc', 'bob', 'brask', 'brya', 'brya-arc-t', 'brya-debug-kernel',
-    'brya-manatee', 'brya-zephyr', 'bubs', 'caroline', 'cave', 'celes', 'chell',
-    'cherry', 'cherry64', 'coral', 'corsola', 'cyan', 'dedede',
-    'dedede-debug-kernel', 'draco', 'drallion', 'edgar', 'elm', 'endeavour',
-    'eve', 'eve-arc-r', 'excelsior', 'fizz', 'fizz-labstation', 'ghost',
-    'glados', 'grunt', 'grunt-arc-r', 'guybrush', 'guybrush-debug-kernel',
-    'hana', 'hatch', 'hatch-arc-r', 'hatch-arc-t', 'hatch-borealis',
-    'herobrine', 'jacuzzi', 'kalista', 'keeby', 'kefka', 'kevin',
-    'kevin-kernelnext', 'kevin64', 'kukui', 'kukui-debug-kernel', 'lars',
-    'majolica', 'nami', 'nautilus', 'nissa', 'nocturne', 'novato',
-    'novato-arc64', 'octopus', 'octopus-chrome-dcheck', 'octopus-debug-kernel',
-    'puff', 'puff-borealis', 'pyro', 'rammus', 'rammus-arc-r', 'reef', 'reks',
-    'relm', 'reven', 'reven-vmtest', 'rex', 'sand', 'sarien', 'scarlet',
-    'scarlet-kernelnext', 'sentry', 'setzer', 'skyrim', 'sludge', 'snappy',
-    'soraka', 'strongbad', 'strongbad-kernelnext', 'tael', 'tatl', 'terra',
-    'trogdor', 'trogdor-debug-kernel', 'trogdor-kernelnext',
-    'trogdor-kernelnext-debug-kernel', 'trogdor-zephyr', 'trogdor64', 'ultima',
-    'viking', 'volteer', 'volteer-borealis', 'wizpig', 'zork', 'zork-borealis',
-    'zork-floss', 'zork-mandolin'
+    'brya-faceauth', 'brya-zephyr', 'bubs', 'caroline', 'cave', 'chell',
+    'cherry', 'cherry64', 'coral', 'corsola', 'dedede', 'dedede-debug-kernel',
+    'draco', 'drallion', 'elm', 'endeavour', 'eve', 'eve-arc-r', 'excelsior',
+    'fizz', 'fizz-labstation', 'glados', 'grunt', 'grunt-arc-r', 'guybrush',
+    'guybrush-debug-kernel', 'hana', 'hatch', 'hatch-arc-r', 'hatch-arc-t',
+    'herobrine', 'jacuzzi', 'kalista', 'keeby', 'kevin', 'kevin64', 'kukui',
+    'kukui-arc-r', 'kukui-debug-kernel', 'lars', 'majolica', 'nami', 'nautilus',
+    'nissa', 'nocturne', 'novato', 'novato-arc64', 'octopus',
+    'octopus-chrome-dcheck', 'octopus-debug-kernel', 'puff', 'pyro', 'rammus',
+    'rammus-arc-r', 'reef', 'reven', 'reven-kernelnext', 'reven-vmtest', 'sand',
+    'sarien', 'scarlet', 'sentry', 'skyrim', 'sludge', 'snappy', 'soraka',
+    'strongbad', 'strongbad-kernelnext', 'tael', 'tatl', 'trogdor',
+    'trogdor-debug-kernel', 'trogdor-kernelnext',
+    'trogdor-kernelnext-debug-kernel', 'trogdor-zephyr', 'trogdor64', 'viking',
+    'volteer', 'zork', 'zork-arc-r', 'zork-floss', 'zork-mandolin'
 ]
 DEFAULT_BOARDS = [
-    'brya', 'endeavour', 'novato', 'sludge', 'nocturne', 'kevin', 'eve',
-    'ghost', 'herobrine', 'kukui', 'octopus', 'reven', 'scarlet', 'snappy',
-    'tael'
+    'brya-faceauth', 'endeavour', 'betty', 'sludge', 'nocturne', 'kevin', 'eve',
+    'herobrine', 'kukui', 'nissa', 'novato', 'octopus', 'reven', 'scarlet',
+    'snappy', 'tael'
 ]
 
 # Not used. For reference only.
@@ -51,27 +48,28 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hps-tool', 'chromeos-base/hpsd',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mtpd',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/factory_runtime_probe',
+        'chromeos-base/featured', 'chromeos-base/foomatic_shell',
+        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hps-tool',
+        'chromeos-base/hpsd', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
+        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
+        'chromeos-base/mems_setup', 'chromeos-base/metrics',
+        'chromeos-base/missive', 'chromeos-base/mist', 'chromeos-base/ml',
+        'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
+        'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mtpd',
         'chromeos-base/nnapi', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
@@ -93,12 +91,13 @@
         'chromeos-base/trunks', 'chromeos-base/update_engine',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'net-wireless/bluez', 'net-wireless/floss'
     ],
@@ -119,27 +118,29 @@
         'chromeos-base/cryptohome', 'chromeos-base/cryptohome-client',
         'chromeos-base/cryptohome-dev-utils', 'chromeos-base/debugd',
         'chromeos-base/dev-install', 'chromeos-base/diagnostics',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/factory_runtime_probe',
-        'chromeos-base/featured', 'chromeos-base/foomatic_shell',
-        'chromeos-base/fusebox', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hps-tool', 'chromeos-base/hpsd',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/missive', 'chromeos-base/mist', 'chromeos-base/ml',
-        'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
-        'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
+        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hps-tool',
+        'chromeos-base/hpsd', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
+        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
+        'chromeos-base/metrics', 'chromeos-base/missive', 'chromeos-base/mist',
+        'chromeos-base/ml', 'chromeos-base/ml-client',
+        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -159,12 +160,13 @@
         'chromeos-base/u2fd', 'chromeos-base/u2fd-client',
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-usb-printer',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'net-wireless/bluez', 'net-wireless/floss'
     ],
@@ -186,28 +188,29 @@
         'chromeos-base/cryptohome', 'chromeos-base/cryptohome-client',
         'chromeos-base/cryptohome-dev-utils', 'chromeos-base/debugd',
         'chromeos-base/dev-install', 'chromeos-base/diagnostics',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/factory_runtime_probe',
-        'chromeos-base/featured', 'chromeos-base/foomatic_shell',
-        'chromeos-base/fusebox', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hps-tool', 'chromeos-base/hpsd',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/missive', 'chromeos-base/mist', 'chromeos-base/ml',
-        'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
-        'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
-        'chromeos-base/mtpd', 'chromeos-base/nnapi',
-        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
+        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hps-tool',
+        'chromeos-base/hpsd', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
+        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
+        'chromeos-base/metrics', 'chromeos-base/missive', 'chromeos-base/mist',
+        'chromeos-base/ml', 'chromeos-base/ml-client',
+        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mtpd',
+        'chromeos-base/nnapi', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -227,12 +230,13 @@
         'chromeos-base/u2fd', 'chromeos-base/u2fd-client',
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-usb-printer',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'net-wireless/bluez', 'net-wireless/floss'
     ],
@@ -260,9 +264,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -282,8 +286,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -305,10 +311,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -335,6 +342,91 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
+        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
+        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
+        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
+        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
+        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
+        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
+        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
+        'chromeos-base/libcrossystem', 'chromeos-base/libec',
+        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
+        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
+        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
+        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
+        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
+        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
+        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
+        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
+        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
+        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
+        'chromeos-base/perfetto_simple_producer',
+        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
+        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
+        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
+        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
+        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
+        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
+        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
+        'chromeos-base/session_manager-client', 'chromeos-base/shill',
+        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
+        'chromeos-base/shill-net', 'chromeos-base/smbfs',
+        'chromeos-base/smbprovider', 'chromeos-base/spaced',
+        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
+        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
+        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
+        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
+        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
+        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
+        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
+        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
+        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
+        'media-libs/cros-camera-hal-usb',
+        'media-libs/cros-camera-libcamera_connector_test',
+        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
+        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
+        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
+        'net-wireless/floss'
+    ],
+    'atlas': [
+        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
+        'chromeos-base/arc-data-snapshotd',
+        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
+        'chromeos-base/arc-setup',
+        'chromeos-base/arcvm-boot-notification-server',
+        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
+        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
+        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
+        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
+        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
+        'chromeos-base/chaps', 'chromeos-base/chaps-client',
+        'chromeos-base/chromeos-common-script',
+        'chromeos-base/chromeos-config-tools',
+        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
+        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
+        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
+        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
+        'chromeos-base/cros-camera-android-deps',
+        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
+        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
+        'chromeos-base/croslog', 'chromeos-base/cryptohome',
+        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
+        'chromeos-base/debugd', 'chromeos-base/dev-install',
+        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
         'chromeos-base/dlp', 'chromeos-base/dns-proxy',
         'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
@@ -356,8 +448,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -380,98 +474,46 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
-        'net-wireless/floss'
-    ],
-    'atlas': [
-        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-appfuse', 'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-keymaster', 'chromeos-base/arc-obb-mounter',
-        'chromeos-base/arc-sdcard', 'chromeos-base/arc-setup',
-        'chromeos-base/attestation', 'chromeos-base/attestation-client',
-        'chromeos-base/authpolicy', 'chromeos-base/biod_proxy',
-        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
-        'chromeos-base/bootstat', 'chromeos-base/cbor',
-        'chromeos-base/cdm-oemcrypto', 'chromeos-base/chaps',
-        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu3',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
     ],
-    'banon': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
+    'beaglebone': [
+        'chromeos-base/attestation', 'chromeos-base/attestation-client',
+        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
+        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
+        'chromeos-base/cbor', 'chromeos-base/chaps',
+        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
+        'chromeos-base/chromeos-config-tools', 'chromeos-base/chromeos-init',
+        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-trim',
+        'chromeos-base/crash-reporter', 'chromeos-base/croslog',
+        'chromeos-base/cryptohome-dev-utils', 'chromeos-base/dev-install',
+        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
+        'chromeos-base/libcrossystem', 'chromeos-base/libec',
+        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
+        'chromeos-base/libipp', 'chromeos-base/libpasswordprovider',
+        'chromeos-base/libtpmcrypto', 'chromeos-base/metrics',
+        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
+        'chromeos-base/policy_utils', 'chromeos-base/secure-erase-file',
+        'chromeos-base/shill', 'chromeos-base/shill-client',
+        'chromeos-base/shill-net', 'chromeos-base/syslog-cat',
+        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
+        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
+        'chromeos-base/update_engine', 'chromeos-base/verity',
+        'chromeos-base/virtual-usb-printer', 'dev-util/bsdiff',
+        'dev-util/puffin'
+    ],
+    'betty': [
+        'chromeos-base/aosp-frameworks-ml-nn',
+        'chromeos-base/aosp-frameworks-ml-nn-vts', 'chromeos-base/arc-adbd',
         'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
         'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
         'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
@@ -493,13 +535,15 @@
         'chromeos-base/croslog', 'chromeos-base/cryptohome',
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
+        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
         'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
         'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/federated-service', 'chromeos-base/foomatic_shell',
+        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hps-tool',
+        'chromeos-base/hpsd', 'chromeos-base/hwsec-test-utils',
         'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
         'chromeos-base/imageloader', 'chromeos-base/kerberos',
         'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
@@ -516,60 +560,41 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/nnapi', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
+        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
+        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
+        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
+        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
+        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
+        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
+        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
+        'chromeos-base/session_manager-client', 'chromeos-base/shill',
+        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
+        'chromeos-base/shill-net', 'chromeos-base/smbfs',
+        'chromeos-base/smbprovider', 'chromeos-base/spaced',
+        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
+        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
+        'chromeos-base/tpm2-simulator', 'chromeos-base/tpm_manager',
+        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
+        'chromeos-base/trunks', 'chromeos-base/update_engine',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
-    'beaglebone': [
-        'chromeos-base/attestation', 'chromeos-base/attestation-client',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/chaps',
-        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/croslog',
-        'chromeos-base/cryptohome', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/dev-install', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libipp',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/metrics', 'chromeos-base/patchpanel',
-        'chromeos-base/patchpanel-client', 'chromeos-base/policy_utils',
-        'chromeos-base/secure-erase-file', 'chromeos-base/shill',
-        'chromeos-base/shill-net', 'chromeos-base/syslog-cat',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/update_engine', 'chromeos-base/verity',
-        'chromeos-base/virtual-usb-printer', 'dev-util/bsdiff',
-        'dev-util/puffin'
+        'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
+        'net-wireless/bluez', 'net-wireless/floss'
     ],
     'betty-arc-r': [
         'chromeos-base/aosp-frameworks-ml-nn',
@@ -597,31 +622,34 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hps-tool', 'chromeos-base/hpsd',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
+        'chromeos-base/federated-service', 'chromeos-base/foomatic_shell',
+        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hps-tool',
+        'chromeos-base/hpsd', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
+        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
+        'chromeos-base/mems_setup', 'chromeos-base/metrics',
+        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
+        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/nnapi',
-        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/nnapi', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -643,12 +671,13 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -679,31 +708,34 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hps-tool', 'chromeos-base/hpsd',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
+        'chromeos-base/federated-service', 'chromeos-base/foomatic_shell',
+        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hps-tool',
+        'chromeos-base/hpsd', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
+        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
+        'chromeos-base/mems_setup', 'chromeos-base/metrics',
+        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
+        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/nnapi',
-        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/nnapi', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -725,12 +757,13 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -760,31 +793,34 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hps-tool', 'chromeos-base/hpsd',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
+        'chromeos-base/federated-service', 'chromeos-base/foomatic_shell',
+        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hps-tool',
+        'chromeos-base/hpsd', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
+        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
+        'chromeos-base/mems_setup', 'chromeos-base/metrics',
+        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
+        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/nnapi',
-        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/nnapi', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -806,12 +842,13 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -839,8 +876,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -860,8 +898,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -884,11 +924,11 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -919,8 +959,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -941,8 +982,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/pciguard', 'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -966,13 +1009,14 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -1031,6 +1075,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -1056,14 +1101,15 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-auto-framing-tests',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-auto-framing-tests',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb', 'media-libs/cros-camera-hdrnet-tests',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -1122,6 +1168,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -1147,14 +1194,15 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-auto-framing-tests',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-auto-framing-tests',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb', 'media-libs/cros-camera-hdrnet-tests',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -1213,6 +1261,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -1238,29 +1287,31 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-auto-framing-tests',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-auto-framing-tests',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb', 'media-libs/cros-camera-hdrnet-tests',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
     ],
-    'brya-manatee': [
+    'brya-faceauth': [
         'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-appfuse', 'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-keymaster', 'chromeos-base/arc-obb-mounter',
-        'chromeos-base/arc-sdcard', 'chromeos-base/arc-setup',
-        'chromeos-base/attestation', 'chromeos-base/attestation-client',
-        'chromeos-base/authpolicy', 'chromeos-base/biod',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/cdm-oemcrypto-hw-test',
+        'chromeos-base/arc-data-snapshotd',
+        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
+        'chromeos-base/arc-setup',
+        'chromeos-base/arcvm-boot-notification-server',
+        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
+        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
+        'chromeos-base/biod', 'chromeos-base/biod_proxy',
+        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
+        'chromeos-base/bootstat', 'chromeos-base/cbor',
+        'chromeos-base/cdm-oemcrypto', 'chromeos-base/cdm-oemcrypto-hw-test',
         'chromeos-base/cdm-oemcrypto-hw-test-wv14',
         'chromeos-base/cdm-oemcrypto-wv14', 'chromeos-base/chaps',
         'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
@@ -1278,7 +1329,7 @@
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
         'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
         'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/easy-unlock-crypto', 'chromeos-base/face-cli',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/fibocom-firmware', 'chromeos-base/foomatic_shell',
         'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
@@ -1303,6 +1354,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -1328,14 +1380,15 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-auto-framing-tests',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-auto-framing-tests',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb', 'media-libs/cros-camera-hdrnet-tests',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -1394,6 +1447,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -1419,14 +1473,15 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-auto-framing-tests',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-auto-framing-tests',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb', 'media-libs/cros-camera-hdrnet-tests',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -1454,8 +1509,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -1475,8 +1531,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -1498,12 +1556,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -1532,9 +1591,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -1554,8 +1613,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -1577,10 +1638,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -1608,9 +1670,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -1630,8 +1692,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -1653,86 +1717,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
-    'celes': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -1760,9 +1749,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -1782,8 +1771,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -1805,10 +1796,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -1835,8 +1827,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -1857,6 +1850,7 @@
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -1876,33 +1870,35 @@
         'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
         'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
         'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
+        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
         'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
         'chromeos-base/update_engine', 'chromeos-base/update_engine-client',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
     ],
     'cherry64': [
         'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-appfuse', 'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-keymaster', 'chromeos-base/arc-obb-mounter',
-        'chromeos-base/arc-sdcard', 'chromeos-base/arc-setup',
-        'chromeos-base/attestation', 'chromeos-base/attestation-client',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
+        'chromeos-base/arc-data-snapshotd',
+        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
+        'chromeos-base/arc-setup',
+        'chromeos-base/arcvm-boot-notification-server',
+        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
+        'chromeos-base/attestation-client', 'chromeos-base/biod_proxy',
+        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
+        'chromeos-base/bootstat', 'chromeos-base/cbor',
+        'chromeos-base/cdm-oemcrypto', 'chromeos-base/chaps',
+        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
         'chromeos-base/chromeos-config-tools',
         'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
         'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
@@ -1915,8 +1911,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -1937,6 +1934,7 @@
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -1956,18 +1954,19 @@
         'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
         'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
         'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
+        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
         'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
         'chromeos-base/update_engine', 'chromeos-base/update_engine-client',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -2019,6 +2018,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -2043,11 +2043,11 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -2079,29 +2079,32 @@
         'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
         'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
-        'chromeos-base/glib-bridge', 'chromeos-base/google-lpa',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hermes',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
+        'chromeos-base/fibocom-firmware', 'chromeos-base/foomatic_shell',
+        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
+        'chromeos-base/gemalto-firmware', 'chromeos-base/glib-bridge',
+        'chromeos-base/google-lpa', 'chromeos-base/hardware_verifier',
+        'chromeos-base/hermes', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
+        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
+        'chromeos-base/lvmd', 'chromeos-base/mems_setup',
         'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/minios',
         'chromeos-base/missive', 'chromeos-base/mist', 'chromeos-base/ml',
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/modemfwd',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -2120,95 +2123,21 @@
         'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
         'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
         'chromeos-base/trunks', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/update_engine-client', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
-        'net-wireless/floss'
-    ],
-    'cyan': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
+        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
+        'chromeos-base/update_engine', 'chromeos-base/update_engine-client',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
+        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
+        'net-wireless/floss'
     ],
     'dedede': [
         'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
@@ -2261,6 +2190,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -2285,13 +2215,14 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -2347,6 +2278,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -2371,13 +2303,14 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -2409,8 +2342,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -2431,8 +2365,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/pciguard', 'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -2456,13 +2392,14 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -2516,6 +2453,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -2540,92 +2478,17 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
     ],
-    'edgar': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
     'elm': [
         'app-crypt/trousers', 'chromeos-base/arc-adbd',
         'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
@@ -2649,8 +2512,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -2670,8 +2534,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -2693,10 +2559,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -2720,8 +2587,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -2741,7 +2609,8 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mri_package',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mri_package',
         'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
@@ -2764,12 +2633,14 @@
         'chromeos-base/u2fd-corp', 'chromeos-base/update_engine',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/viking-hid', 'chromeos-base/virtual-usb-printer',
-        'chromeos-base/vm_host_tools', 'chromeos-base/vpn-manager',
-        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
-        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vm_host_tools', 'chromeos-base/vtpm',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-ip', 'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-wireless/bluez', 'net-wireless/floss',
         'sys-apps/aver-updater', 'sys-apps/bizlink-updater',
@@ -2804,8 +2675,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -2825,8 +2697,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -2850,12 +2724,13 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -2885,8 +2760,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -2906,8 +2782,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -2931,12 +2809,13 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -2961,8 +2840,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -2981,7 +2861,8 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mri_package',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mri_package',
         'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
@@ -3004,12 +2885,13 @@
         'chromeos-base/u2fd-corp', 'chromeos-base/update_engine',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-wireless/bluez', 'net-wireless/floss',
         'sys-apps/aver-updater', 'sys-apps/bizlink-updater',
@@ -3043,8 +2925,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -3064,8 +2947,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -3088,12 +2973,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -3115,26 +3001,27 @@
         'chromeos-base/cryptohome', 'chromeos-base/cryptohome-client',
         'chromeos-base/cryptohome-dev-utils', 'chromeos-base/debugd',
         'chromeos-base/dev-install', 'chromeos-base/diagnostics',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/missive', 'chromeos-base/ml',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/factory_runtime_probe',
+        'chromeos-base/featured', 'chromeos-base/foomatic_shell',
+        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda-gpu-tests', 'chromeos-base/mems_setup',
+        'chromeos-base/metrics', 'chromeos-base/missive', 'chromeos-base/ml',
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -3155,100 +3042,16 @@
         'chromeos-base/trunks', 'chromeos-base/u2fd',
         'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vpn-manager',
-        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
-        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'net-wireless/bluez', 'net-wireless/floss'
-    ],
-    'ghost': [
-        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-setup',
-        'chromeos-base/arcvm-boot-notification-server',
-        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod', 'chromeos-base/biod_proxy',
-        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
-        'chromeos-base/bootstat', 'chromeos-base/cbor',
-        'chromeos-base/cdm-oemcrypto', 'chromeos-base/cdm-oemcrypto-hw-test',
-        'chromeos-base/cdm-oemcrypto-hw-test-wv14',
-        'chromeos-base/cdm-oemcrypto-wv14', 'chromeos-base/chaps',
-        'chromeos-base/chaps-client', 'chromeos-base/chargesplash',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/lvmd',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/minios', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/pciguard', 'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
-        'chromeos-base/update_engine', 'chromeos-base/update_engine-client',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
+        'chromeos-base/virtual-usb-printer', 'chromeos-base/vtpm',
         'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
         'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-intel-ipu6',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
-        'net-wireless/floss'
+        'net-wireless/bluez', 'net-wireless/floss'
     ],
     'glados': [
         'app-crypt/trousers', 'chromeos-base/arc-adbd',
@@ -3274,9 +3077,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -3296,8 +3099,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -3319,10 +3124,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -3349,8 +3155,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -3370,8 +3177,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -3394,12 +3203,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -3429,8 +3239,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -3450,8 +3261,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -3474,12 +3287,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -3536,8 +3350,10 @@
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/modemfwd',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -3555,18 +3371,19 @@
         'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
         'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
         'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
+        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
         'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
         'chromeos-base/update_engine', 'chromeos-base/update_engine-client',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -3623,8 +3440,10 @@
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/modemfwd',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -3642,18 +3461,19 @@
         'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
         'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
         'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
+        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
         'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
         'chromeos-base/update_engine', 'chromeos-base/update_engine-client',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -3681,8 +3501,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -3702,8 +3523,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -3725,10 +3548,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -3781,6 +3605,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -3805,12 +3630,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -3864,6 +3690,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -3888,12 +3715,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -3947,6 +3775,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -3971,95 +3800,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
-        'net-wireless/bluez', 'net-wireless/floss'
-    ],
-    'hatch-borealis': [
-        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-setup',
-        'chromeos-base/arcvm-boot-notification-server',
-        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod', 'chromeos-base/biod_proxy',
-        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
-        'chromeos-base/bootstat', 'chromeos-base/cbor',
-        'chromeos-base/cdm-oemcrypto', 'chromeos-base/chaps',
-        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/fibocom-firmware', 'chromeos-base/foomatic_shell',
-        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
-        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
-        'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -4110,11 +3857,12 @@
         'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
         'chromeos-base/lorgnette_cli', 'chromeos-base/lvmd',
         'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
+        'chromeos-base/midis', 'chromeos-base/minios', 'chromeos-base/missive',
+        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -4137,15 +3885,17 @@
         'chromeos-base/tpm_softclear_utils', 'chromeos-base/trunks',
         'chromeos-base/typecd', 'chromeos-base/u2fd',
         'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
+        'chromeos-base/update_engine', 'chromeos-base/update_engine-client',
+        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
+        'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -4173,8 +3923,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -4194,8 +3945,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -4213,17 +3966,18 @@
         'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
         'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
         'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
+        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
         'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -4253,8 +4007,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -4274,8 +4029,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -4298,12 +4055,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -4357,6 +4115,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -4380,93 +4139,18 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
     ],
-    'kefka': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
     'kevin': [
         'app-crypt/trousers', 'chromeos-base/arc-adbd',
         'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
@@ -4490,8 +4174,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -4511,8 +4196,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -4534,84 +4221,11 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
-    'kevin-kernelnext': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/biod_proxy',
-        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
-        'chromeos-base/bootstat', 'chromeos-base/cbor',
-        'chromeos-base/cdm-oemcrypto', 'chromeos-base/chaps',
-        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/touch_firmware_calibration', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/u2fd', 'chromeos-base/u2fd-client',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -4638,8 +4252,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -4659,8 +4274,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -4682,10 +4299,11 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -4712,8 +4330,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hammerd',
@@ -4734,8 +4353,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -4758,12 +4379,97 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-mtk', 'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
+        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
+        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
+        'net-wireless/floss'
+    ],
+    'kukui-arc-r': [
+        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
+        'chromeos-base/arc-data-snapshotd',
+        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
+        'chromeos-base/arc-setup',
+        'chromeos-base/arcvm-boot-notification-server',
+        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
+        'chromeos-base/attestation-client', 'chromeos-base/biod_proxy',
+        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
+        'chromeos-base/bootstat', 'chromeos-base/cbor',
+        'chromeos-base/cdm-oemcrypto', 'chromeos-base/chaps',
+        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
+        'chromeos-base/chromeos-config-tools',
+        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
+        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
+        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
+        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
+        'chromeos-base/cros-camera-android-deps',
+        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
+        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
+        'chromeos-base/croslog', 'chromeos-base/cryptohome',
+        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
+        'chromeos-base/debugd', 'chromeos-base/dev-install',
+        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
+        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
+        'chromeos-base/g2f_tools', 'chromeos-base/hammerd',
+        'chromeos-base/hammerd-test-utils', 'chromeos-base/hardware_verifier',
+        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
+        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
+        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
+        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
+        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
+        'chromeos-base/libcrossystem', 'chromeos-base/libec',
+        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
+        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
+        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
+        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
+        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
+        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
+        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
+        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
+        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
+        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
+        'chromeos-base/perfetto_simple_producer',
+        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
+        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
+        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
+        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
+        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
+        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
+        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
+        'chromeos-base/session_manager-client', 'chromeos-base/shill',
+        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
+        'chromeos-base/shill-net', 'chromeos-base/smbfs',
+        'chromeos-base/smbprovider', 'chromeos-base/spaced',
+        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
+        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
+        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
+        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
+        'chromeos-base/trunks', 'chromeos-base/u2fd',
+        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
+        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
+        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
+        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
+        'media-libs/cros-camera-hal-mtk', 'media-libs/cros-camera-hal-usb',
+        'media-libs/cros-camera-libcamera_connector_test',
+        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -4791,8 +4497,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hammerd',
@@ -4813,8 +4520,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -4837,12 +4546,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-mtk', 'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -4871,9 +4581,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -4893,8 +4603,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -4916,10 +4628,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -4948,85 +4661,7 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm2-simulator',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/trunks',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
-        'net-wireless/floss'
-    ],
-    'nami': [
-        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-appfuse', 'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-keymaster', 'chromeos-base/arc-obb-mounter',
-        'chromeos-base/arc-sdcard', 'chromeos-base/arc-setup',
-        'chromeos-base/attestation', 'chromeos-base/attestation-client',
-        'chromeos-base/authpolicy', 'chromeos-base/biod',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
         'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
         'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
@@ -5048,8 +4683,93 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
+        'chromeos-base/perfetto_simple_producer',
+        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
+        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
+        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
+        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
+        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
+        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
+        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
+        'chromeos-base/session_manager-client', 'chromeos-base/shill',
+        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
+        'chromeos-base/shill-net', 'chromeos-base/smbfs',
+        'chromeos-base/smbprovider', 'chromeos-base/spaced',
+        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
+        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
+        'chromeos-base/timberslide', 'chromeos-base/tpm2-simulator',
+        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
+        'chromeos-base/tpm_softclear_utils', 'chromeos-base/trunks',
+        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
+        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
+        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
+        'media-libs/cros-camera-hal-usb',
+        'media-libs/cros-camera-libcamera_connector_test',
+        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
+        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
+        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
+        'net-wireless/floss'
+    ],
+    'nami': [
+        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
+        'chromeos-base/arc-data-snapshotd',
+        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
+        'chromeos-base/arc-setup',
+        'chromeos-base/arcvm-boot-notification-server',
+        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
+        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
+        'chromeos-base/biod', 'chromeos-base/biod_proxy',
+        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
+        'chromeos-base/bootstat', 'chromeos-base/cbor',
+        'chromeos-base/cdm-oemcrypto', 'chromeos-base/chaps',
+        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
+        'chromeos-base/chromeos-config-tools',
+        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
+        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
+        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
+        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
+        'chromeos-base/cros-camera-android-deps',
+        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
+        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
+        'chromeos-base/croslog', 'chromeos-base/cryptohome',
+        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
+        'chromeos-base/debugd', 'chromeos-base/dev-install',
+        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
+        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
+        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
+        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
+        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
+        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
+        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
+        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
+        'chromeos-base/libcrossystem', 'chromeos-base/libec',
+        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
+        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
+        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
+        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
+        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
+        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
+        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
+        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
+        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
+        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -5072,12 +4792,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -5129,6 +4850,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -5153,13 +4875,14 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu3',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -5190,10 +4913,10 @@
         'chromeos-base/croslog', 'chromeos-base/cryptohome',
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/diagnostics', 'chromeos-base/discod',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/fibocom-firmware', 'chromeos-base/foomatic_shell',
         'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
@@ -5217,8 +4940,10 @@
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/modemfwd',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/pciguard', 'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -5242,29 +4967,31 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
     ],
     'nocturne': [
         'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-appfuse', 'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-keymaster', 'chromeos-base/arc-obb-mounter',
-        'chromeos-base/arc-sdcard', 'chromeos-base/arc-setup',
-        'chromeos-base/attestation', 'chromeos-base/attestation-client',
-        'chromeos-base/authpolicy', 'chromeos-base/biod',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
+        'chromeos-base/arc-data-snapshotd',
+        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
+        'chromeos-base/arc-setup',
+        'chromeos-base/arcvm-boot-notification-server',
+        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
+        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
+        'chromeos-base/biod', 'chromeos-base/biod_proxy',
+        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
+        'chromeos-base/bootstat', 'chromeos-base/cbor',
+        'chromeos-base/cdm-oemcrypto', 'chromeos-base/chaps',
+        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
         'chromeos-base/chromeos-config-tools',
         'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
         'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
@@ -5277,9 +5004,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hammerd',
@@ -5300,8 +5027,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -5324,13 +5053,14 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu3',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -5359,9 +5089,9 @@
         'chromeos-base/cryptohome', 'chromeos-base/cryptohome-client',
         'chromeos-base/cryptohome-dev-utils', 'chromeos-base/debugd',
         'chromeos-base/dev-install', 'chromeos-base/diagnostics',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/goldfishd',
@@ -5382,9 +5112,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/nnapi',
-        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/nnapi', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -5405,12 +5136,14 @@
         'chromeos-base/trunks', 'chromeos-base/update_engine',
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vpn-manager',
-        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
-        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/virtual-usb-printer', 'chromeos-base/vtpm',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -5440,8 +5173,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/goldfishd',
@@ -5463,9 +5197,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/nnapi',
-        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/nnapi', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -5487,12 +5222,13 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -5548,6 +5284,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -5572,12 +5309,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -5633,6 +5371,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -5657,12 +5396,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -5718,6 +5458,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -5742,12 +5483,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -5777,8 +5519,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -5798,8 +5541,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -5822,92 +5567,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
-        'net-wireless/bluez', 'net-wireless/floss'
-    ],
-    'puff-borealis': [
-        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-setup',
-        'chromeos-base/arcvm-boot-notification-server',
-        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -5935,9 +5601,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -5957,8 +5623,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -5981,11 +5649,11 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -6012,8 +5680,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -6033,8 +5702,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -6057,12 +5728,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -6092,8 +5764,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -6113,8 +5786,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -6137,12 +5812,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -6170,9 +5846,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -6192,8 +5868,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -6216,163 +5894,11 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
-    'reks': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
-    'relm': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -6395,8 +5921,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/flex_id', 'chromeos-base/foomatic_shell',
         'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
@@ -6417,33 +5944,110 @@
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
         'chromeos-base/policy_utils', 'chromeos-base/power_manager',
         'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/trunks',
-        'chromeos-base/u2fd', 'chromeos-base/u2fd-client',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-usb-printer',
-        'chromeos-base/vm_host_tools', 'chromeos-base/vpn-manager',
+        'chromeos-base/quipper', 'chromeos-base/run_oci',
+        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
+        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
+        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
+        'chromeos-base/shill', 'chromeos-base/shill-client',
+        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
+        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
+        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
+        'chromeos-base/system-proxy', 'chromeos-base/system_api',
+        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/tpm_manager',
+        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
+        'chromeos-base/trunks', 'chromeos-base/u2fd',
+        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
+        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
+        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
         'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
         'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
+        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
+        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
+        'net-wireless/floss'
+    ],
+    'reven-kernelnext': [
+        'app-crypt/trousers', 'chromeos-base/attestation',
+        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
+        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
+        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
+        'chromeos-base/cbor', 'chromeos-base/chaps',
+        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
+        'chromeos-base/chromeos-config-tools',
+        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
+        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
+        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
+        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
+        'chromeos-base/cros-camera-android-deps',
+        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
+        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
+        'chromeos-base/croslog', 'chromeos-base/cryptohome',
+        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
+        'chromeos-base/debugd', 'chromeos-base/dev-install',
+        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
+        'chromeos-base/flex_id', 'chromeos-base/foomatic_shell',
+        'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
+        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
+        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
+        'chromeos-base/imageloader', 'chromeos-base/kerberos',
+        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
+        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
+        'chromeos-base/libec', 'chromeos-base/libhwsec',
+        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
+        'chromeos-base/libipp', 'chromeos-base/libmems',
+        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
+        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
+        'chromeos-base/mems_setup', 'chromeos-base/metrics',
+        'chromeos-base/missive', 'chromeos-base/mist', 'chromeos-base/ml',
+        'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
+        'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
+        'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
+        'chromeos-base/perfetto_simple_producer',
+        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
+        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
+        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
+        'chromeos-base/quipper', 'chromeos-base/run_oci',
+        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
+        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
+        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
+        'chromeos-base/shill', 'chromeos-base/shill-client',
+        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
+        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
+        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
+        'chromeos-base/system-proxy', 'chromeos-base/system_api',
+        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/tpm_manager',
+        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
+        'chromeos-base/trunks', 'chromeos-base/u2fd',
+        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
+        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
+        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
+        'media-libs/cros-camera-hal-usb',
+        'media-libs/cros-camera-libcamera_connector_test',
+        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -6467,8 +6071,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/flex_id', 'chromeos-base/foomatic_shell',
         'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
@@ -6489,115 +6094,36 @@
         'chromeos-base/ml-benchmark', 'chromeos-base/ml-benchmark-drivers',
         'chromeos-base/ml-client', 'chromeos-base/ml-cmdline',
         'chromeos-base/modem-utilities', 'chromeos-base/mojo_service_manager',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager-test', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
         'chromeos-base/policy_utils', 'chromeos-base/power_manager',
         'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/tpm2-simulator', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
+        'chromeos-base/quipper', 'chromeos-base/run_oci',
+        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
+        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
+        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
+        'chromeos-base/shill', 'chromeos-base/shill-client',
+        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
+        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
+        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
+        'chromeos-base/system-proxy', 'chromeos-base/system_api',
+        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/tpm2-simulator',
+        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
+        'chromeos-base/tpm_softclear_utils', 'chromeos-base/trunks',
+        'chromeos-base/u2fd', 'chromeos-base/u2fd-client',
+        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
+        'chromeos-base/verity', 'chromeos-base/virtual-usb-printer',
+        'chromeos-base/vm_host_tools', 'chromeos-base/vtpm',
         'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
-        'net-wireless/floss'
-    ],
-    'rex': [
-        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-setup',
-        'chromeos-base/arcvm-boot-notification-server',
-        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/pciguard', 'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-intel-ipu6',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -6625,9 +6151,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -6647,8 +6173,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -6671,11 +6199,11 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -6728,6 +6256,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -6752,12 +6281,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -6785,8 +6315,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -6806,8 +6337,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -6830,89 +6363,12 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-hal-rockchip-isp1',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-hal-rockchip-isp1',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
-    'scarlet-kernelnext': [
-        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-appfuse', 'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-keymaster', 'chromeos-base/arc-obb-mounter',
-        'chromeos-base/arc-sdcard', 'chromeos-base/arc-setup',
-        'chromeos-base/attestation', 'chromeos-base/attestation-client',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-hal-rockchip-isp1',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -6940,9 +6396,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
@@ -6962,8 +6418,10 @@
         'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
@@ -6985,86 +6443,11 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
-    'setzer': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -7120,6 +6503,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -7140,16 +6524,17 @@
         'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
         'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
         'chromeos-base/trunks', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
+        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
+        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
+        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7183,9 +6568,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice', 'chromeos-base/dlcservice-client',
+        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
+        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
@@ -7205,8 +6590,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7229,11 +6616,12 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/arc-camera-profile', 'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/arc-camera-profile',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
     ],
@@ -7262,8 +6650,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/hammerd',
@@ -7284,8 +6673,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7308,13 +6699,14 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu3',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7342,8 +6734,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
@@ -7366,8 +6759,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7390,12 +6785,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7423,8 +6819,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
@@ -7447,8 +6844,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7471,12 +6870,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7495,82 +6895,6 @@
         'chromeos-base/ndproxyd', 'chromeos-base/sommelier',
         'chromeos-base/termina_container_tools', 'chromeos-base/vm_guest_tools'
     ],
-    'terra': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
     'trogdor': [
         'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
         'chromeos-base/arc-appfuse', 'chromeos-base/arc-data-snapshotd',
@@ -7594,8 +6918,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
@@ -7617,8 +6942,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7641,12 +6968,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7674,8 +7002,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
@@ -7697,8 +7026,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7721,12 +7052,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7754,8 +7086,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
@@ -7777,8 +7110,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7801,12 +7136,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7834,8 +7170,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
@@ -7857,8 +7194,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7881,12 +7220,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7914,8 +7254,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
@@ -7937,8 +7278,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -7961,12 +7304,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -7994,8 +7338,9 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
+        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
+        'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
         'chromeos-base/g2f_tools', 'chromeos-base/gemalto-firmware',
@@ -8017,8 +7362,10 @@
         'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
         'chromeos-base/perfetto_simple_producer',
         'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
@@ -8041,92 +7388,17 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
     ],
-    'ultima': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
-        'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
-    ],
     'viking': [
         'chromeos-base/attestation', 'chromeos-base/attestation-client',
         'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
@@ -8135,13 +7407,13 @@
         'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
         'chromeos-base/chromeos-config-tools', 'chromeos-base/chromeos-init',
         'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-trim',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-dev-utils', 'chromeos-base/dev-install',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libipp',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/metrics',
-        'chromeos-base/policy_utils', 'chromeos-base/secure-erase-file',
+        'chromeos-base/croslog', 'chromeos-base/cryptohome-dev-utils',
+        'chromeos-base/dev-install', 'chromeos-base/libbrillo',
+        'chromeos-base/libchrome', 'chromeos-base/libec',
+        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
+        'chromeos-base/libipp', 'chromeos-base/libtpmcrypto',
+        'chromeos-base/metrics', 'chromeos-base/policy_utils',
+        'chromeos-base/secure-erase-file', 'chromeos-base/shill-client',
         'chromeos-base/syslog-cat', 'chromeos-base/system_api',
         'chromeos-base/tast-local-helpers-cros', 'chromeos-base/tpm_manager',
         'chromeos-base/tpm_manager-client', 'chromeos-base/update_engine',
@@ -8175,220 +7447,65 @@
         'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
         'chromeos-base/debugd', 'chromeos-base/dev-install',
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/pciguard', 'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-intel-ipu6',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
-        'net-wireless/bluez', 'net-wireless/floss'
-    ],
-    'volteer-borealis': [
-        'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-setup',
-        'chromeos-base/arcvm-boot-notification-server',
-        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod', 'chromeos-base/biod_proxy',
-        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
-        'chromeos-base/bootstat', 'chromeos-base/cbor',
-        'chromeos-base/cdm-oemcrypto', 'chromeos-base/cdm-oemcrypto-hw-test',
-        'chromeos-base/cdm-oemcrypto-hw-test-wv14',
-        'chromeos-base/cdm-oemcrypto-wv14', 'chromeos-base/chaps',
-        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
-        'chromeos-base/dlp', 'chromeos-base/dns-proxy',
-        'chromeos-base/easy-unlock', 'chromeos-base/easy-unlock-crypto',
-        'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
-        'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
-        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
-        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
-        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
-        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
-        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
-        'chromeos-base/libcrossystem', 'chromeos-base/libec',
-        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
-        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
-        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
-        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
-        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
-        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
-        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
-        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
-        'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
-        'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
-        'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/pciguard', 'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
-        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
-        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
-        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
-        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
-        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
-        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
-        'chromeos-base/session_manager-client', 'chromeos-base/shill',
-        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
-        'chromeos-base/shill-net', 'chromeos-base/smbfs',
-        'chromeos-base/smbprovider', 'chromeos-base/spaced',
-        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
-        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
-        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
-        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
-        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
-        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
-        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
-        'media-libs/cros-camera-hal-intel-ipu6',
-        'media-libs/cros-camera-hal-usb',
-        'media-libs/cros-camera-libcamera_connector_test',
-        'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
-        'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
-        'net-wireless/bluez', 'net-wireless/floss'
-    ],
-    'wizpig': [
-        'app-crypt/trousers', 'chromeos-base/arc-adbd',
-        'chromeos-base/arc-apk-cache', 'chromeos-base/arc-appfuse',
-        'chromeos-base/arc-data-snapshotd', 'chromeos-base/arc-keymaster',
-        'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/arc-setup', 'chromeos-base/attestation',
-        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
-        'chromeos-base/chromeos-config-tools',
-        'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
-        'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
-        'chromeos-base/chromeos-storage-info', 'chromeos-base/chromeos-trim',
-        'chromeos-base/crash-reporter', 'chromeos-base/cros-camera',
-        'chromeos-base/cros-camera-android-deps',
-        'chromeos-base/cros-camera-libs', 'chromeos-base/cros-camera-tool',
-        'chromeos-base/cros-disks', 'chromeos-base/crosdns',
-        'chromeos-base/croslog', 'chromeos-base/cryptohome',
-        'chromeos-base/cryptohome-client', 'chromeos-base/cryptohome-dev-utils',
-        'chromeos-base/debugd', 'chromeos-base/dev-install',
-        'chromeos-base/diagnostics', 'chromeos-base/disk_updater',
-        'chromeos-base/dlcservice', 'chromeos-base/dlp',
+        'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
         'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
         'chromeos-base/easy-unlock-crypto',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/foomatic_shell', 'chromeos-base/fusebox',
-        'chromeos-base/hardware_verifier', 'chromeos-base/hwsec-test-utils',
-        'chromeos-base/iioservice', 'chromeos-base/iioservice_simpleclient',
-        'chromeos-base/imageloader', 'chromeos-base/kerberos',
-        'chromeos-base/lexmark-fax-pnh', 'chromeos-base/libbrillo',
-        'chromeos-base/libchrome', 'chromeos-base/libchromeos-ui',
-        'chromeos-base/libcontainer', 'chromeos-base/libcrossystem',
-        'chromeos-base/libec', 'chromeos-base/libhwsec',
-        'chromeos-base/libhwsec-foundation', 'chromeos-base/libiioservice_ipc',
-        'chromeos-base/libipp', 'chromeos-base/libmems',
-        'chromeos-base/libpasswordprovider', 'chromeos-base/libtpmcrypto',
-        'chromeos-base/libvda', 'chromeos-base/libvda-gpu-tests',
-        'chromeos-base/lorgnette', 'chromeos-base/lorgnette_cli',
-        'chromeos-base/mems_setup', 'chromeos-base/metrics',
-        'chromeos-base/midis', 'chromeos-base/missive', 'chromeos-base/mist',
-        'chromeos-base/ml', 'chromeos-base/ml-benchmark',
+        'chromeos-base/g2f_tools', 'chromeos-base/hardware_verifier',
+        'chromeos-base/hwsec-test-utils', 'chromeos-base/iioservice',
+        'chromeos-base/iioservice_simpleclient', 'chromeos-base/imageloader',
+        'chromeos-base/kerberos', 'chromeos-base/lexmark-fax-pnh',
+        'chromeos-base/libbrillo', 'chromeos-base/libchrome',
+        'chromeos-base/libchromeos-ui', 'chromeos-base/libcontainer',
+        'chromeos-base/libcrossystem', 'chromeos-base/libec',
+        'chromeos-base/libhwsec', 'chromeos-base/libhwsec-foundation',
+        'chromeos-base/libiioservice_ipc', 'chromeos-base/libipp',
+        'chromeos-base/libmems', 'chromeos-base/libpasswordprovider',
+        'chromeos-base/libtpmcrypto', 'chromeos-base/libvda',
+        'chromeos-base/libvda-gpu-tests', 'chromeos-base/lorgnette',
+        'chromeos-base/lorgnette_cli', 'chromeos-base/mems_setup',
+        'chromeos-base/metrics', 'chromeos-base/midis', 'chromeos-base/missive',
+        'chromeos-base/mist', 'chromeos-base/ml', 'chromeos-base/ml-benchmark',
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
-        'chromeos-base/mojo_service_manager', 'chromeos-base/mount-passthrough',
-        'chromeos-base/mtpd', 'chromeos-base/oobe_config', 'chromeos-base/p2p',
+        'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
+        'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
+        'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
-        'chromeos-base/perfetto_simple_producer',
-        'chromeos-base/permission_broker', 'chromeos-base/policy_utils',
-        'chromeos-base/power_manager', 'chromeos-base/power_manager-client',
-        'chromeos-base/print_tools', 'chromeos-base/quipper',
-        'chromeos-base/rgbkbd', 'chromeos-base/run_oci',
-        'chromeos-base/runtime_probe', 'chromeos-base/screen-capture-utils',
-        'chromeos-base/secanomalyd', 'chromeos-base/secure-erase-file',
-        'chromeos-base/secure-wipe', 'chromeos-base/session_manager-client',
-        'chromeos-base/shill', 'chromeos-base/shill-client',
-        'chromeos-base/shill-dbus-client', 'chromeos-base/shill-net',
-        'chromeos-base/smbfs', 'chromeos-base/smbprovider',
-        'chromeos-base/spaced', 'chromeos-base/syslog-cat',
-        'chromeos-base/system-proxy', 'chromeos-base/system_api',
-        'chromeos-base/tast-local-helpers-cros', 'chromeos-base/timberslide',
-        'chromeos-base/tpm_manager', 'chromeos-base/tpm_manager-client',
-        'chromeos-base/tpm_softclear_utils', 'chromeos-base/u2fd',
-        'chromeos-base/u2fd-client', 'chromeos-base/update_engine',
-        'chromeos-base/usb_bouncer', 'chromeos-base/verity',
-        'chromeos-base/virtual-file-provider',
+        'chromeos-base/pciguard', 'chromeos-base/perfetto_simple_producer',
+        'chromeos-base/permission_broker', 'chromeos-base/pinweaver',
+        'chromeos-base/policy_utils', 'chromeos-base/power_manager',
+        'chromeos-base/power_manager-client', 'chromeos-base/print_tools',
+        'chromeos-base/quipper', 'chromeos-base/rgbkbd',
+        'chromeos-base/run_oci', 'chromeos-base/runtime_probe',
+        'chromeos-base/screen-capture-utils', 'chromeos-base/secanomalyd',
+        'chromeos-base/secure-erase-file', 'chromeos-base/secure-wipe',
+        'chromeos-base/session_manager-client', 'chromeos-base/shill',
+        'chromeos-base/shill-client', 'chromeos-base/shill-dbus-client',
+        'chromeos-base/shill-net', 'chromeos-base/smbfs',
+        'chromeos-base/smbprovider', 'chromeos-base/spaced',
+        'chromeos-base/syslog-cat', 'chromeos-base/system-proxy',
+        'chromeos-base/system_api', 'chromeos-base/tast-local-helpers-cros',
+        'chromeos-base/timberslide', 'chromeos-base/tpm_manager',
+        'chromeos-base/tpm_manager-client', 'chromeos-base/tpm_softclear_utils',
+        'chromeos-base/trunks', 'chromeos-base/typecd', 'chromeos-base/u2fd',
+        'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
+        'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
+        'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin', 'media-libs/cros-camera-hal-usb',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
+        'media-libs/cros-camera-hal-intel-ipu6',
+        'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
-        'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez'
+        'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
+        'net-wireless/bluez', 'net-wireless/floss'
     ],
     'zork': [
         'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
@@ -8440,6 +7557,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -8464,28 +7582,30 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
     ],
-    'zork-borealis': [
+    'zork-arc-r': [
         'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
-        'chromeos-base/arc-appfuse', 'chromeos-base/arc-data-snapshotd',
-        'chromeos-base/arc-keymaster', 'chromeos-base/arc-obb-mounter',
-        'chromeos-base/arc-sdcard', 'chromeos-base/arc-setup',
-        'chromeos-base/attestation', 'chromeos-base/attestation-client',
-        'chromeos-base/authpolicy', 'chromeos-base/biod',
-        'chromeos-base/biod_proxy', 'chromeos-base/bootid-logger',
-        'chromeos-base/bootlockbox-client', 'chromeos-base/bootstat',
-        'chromeos-base/cbor', 'chromeos-base/cdm-oemcrypto',
-        'chromeos-base/chaps', 'chromeos-base/chaps-client',
-        'chromeos-base/chromeos-common-script',
+        'chromeos-base/arc-data-snapshotd',
+        'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
+        'chromeos-base/arc-setup',
+        'chromeos-base/arcvm-boot-notification-server',
+        'chromeos-base/arcvm-mojo-proxy', 'chromeos-base/attestation',
+        'chromeos-base/attestation-client', 'chromeos-base/authpolicy',
+        'chromeos-base/biod', 'chromeos-base/biod_proxy',
+        'chromeos-base/bootid-logger', 'chromeos-base/bootlockbox-client',
+        'chromeos-base/bootstat', 'chromeos-base/cbor',
+        'chromeos-base/cdm-oemcrypto', 'chromeos-base/chaps',
+        'chromeos-base/chaps-client', 'chromeos-base/chromeos-common-script',
         'chromeos-base/chromeos-config-tools',
         'chromeos-base/chromeos-imageburner', 'chromeos-base/chromeos-init',
         'chromeos-base/chromeos-installer', 'chromeos-base/chromeos-login',
@@ -8524,6 +7644,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -8548,12 +7669,13 @@
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -8606,6 +7728,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -8629,12 +7752,14 @@
         'chromeos-base/u2fd-client', 'chromeos-base/u2fd-corp',
         'chromeos-base/update_engine', 'chromeos-base/usb_bouncer',
         'chromeos-base/verity', 'chromeos-base/virtual-file-provider',
-        'chromeos-base/virtual-usb-printer', 'chromeos-base/vpn-manager',
-        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
-        'dev-util/puffin', 'media-libs/cros-camera-document-scanning-test',
+        'chromeos-base/virtual-usb-printer', 'chromeos-base/vtpm',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
+        'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-wireless/bluez',
         'net-wireless/floss'
@@ -8688,6 +7813,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -8711,12 +7837,13 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'dev-libs/libtextclassifier',
-        'dev-util/bsdiff', 'dev-util/puffin',
+        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-usb',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -8730,7 +7857,7 @@
 
 # Not used. For reference only.
 DEFAULT_BOARDS_REASON = {
-    'brya': [
+    'brya-faceauth': [
         'chromeos-base/arc-adbd', 'chromeos-base/arc-apk-cache',
         'chromeos-base/arc-data-snapshotd',
         'chromeos-base/arc-host-clock-service', 'chromeos-base/arc-keymaster',
@@ -8759,7 +7886,7 @@
         'chromeos-base/diagnostics', 'chromeos-base/dlcservice',
         'chromeos-base/dlcservice-client', 'chromeos-base/dlp',
         'chromeos-base/dns-proxy', 'chromeos-base/easy-unlock',
-        'chromeos-base/easy-unlock-crypto',
+        'chromeos-base/easy-unlock-crypto', 'chromeos-base/face-cli',
         'chromeos-base/factory_runtime_probe', 'chromeos-base/featured',
         'chromeos-base/fibocom-firmware', 'chromeos-base/foomatic_shell',
         'chromeos-base/fusebox', 'chromeos-base/g2f_tools',
@@ -8784,6 +7911,7 @@
         'chromeos-base/ml-benchmark-drivers', 'chromeos-base/ml-client',
         'chromeos-base/ml-cmdline', 'chromeos-base/modem-utilities',
         'chromeos-base/modemfwd', 'chromeos-base/mojo_service_manager',
+        'chromeos-base/mojo_service_manager-test',
         'chromeos-base/mount-passthrough', 'chromeos-base/mtpd',
         'chromeos-base/oobe_config', 'chromeos-base/p2p',
         'chromeos-base/patchpanel', 'chromeos-base/patchpanel-client',
@@ -8809,14 +7937,15 @@
         'chromeos-base/usb_bouncer', 'chromeos-base/verity',
         'chromeos-base/virtual-file-provider',
         'chromeos-base/virtual-usb-printer', 'chromeos-base/vm_host_tools',
-        'chromeos-base/vpn-manager', 'chromeos-base/vtpm',
-        'dev-libs/libtextclassifier', 'dev-util/bsdiff', 'dev-util/puffin',
-        'media-libs/cros-camera-auto-framing-tests',
+        'chromeos-base/vtpm', 'dev-libs/libtextclassifier', 'dev-util/bsdiff',
+        'dev-util/puffin', 'media-libs/cros-camera-auto-framing-tests',
         'media-libs/cros-camera-document-scanning-test',
+        'media-libs/cros-camera-frame-annotator',
         'media-libs/cros-camera-hal-intel-ipu6',
         'media-libs/cros-camera-hal-usb', 'media-libs/cros-camera-hdrnet-tests',
         'media-libs/cros-camera-libcamera_connector_test',
         'media-libs/cros-camera-libfs', 'media-libs/cros-camera-libjea_test',
+        'media-libs/cros-camera-sw-privacy-switch-test',
         'media-libs/cros-camera-test', 'media-libs/cros-camera-usb-tests',
         'media-libs/dlm', 'net-print/brother_mlaser', 'net-print/cups_proxy',
         'net-wireless/bluez', 'net-wireless/floss'
@@ -8833,11 +7962,11 @@
         'sys-apps/mimo-mcu-updater', 'sys-apps/mimo-monitor',
         'sys-apps/mimo-updater', 'sys-apps/sis-updater'
     ],
-    'novato': [
+    'betty': [
         'chromeos-base/aosp-frameworks-ml-nn',
         'chromeos-base/aosp-frameworks-ml-nn-vts', 'chromeos-base/arc-appfuse',
         'chromeos-base/arc-obb-mounter', 'chromeos-base/arc-sdcard',
-        'chromeos-base/goldfishd', 'chromeos-base/nnapi',
+        'chromeos-base/federated-service', 'chromeos-base/nnapi',
         'chromeos-base/tpm2-simulator'
     ],
     'sludge': [
@@ -8852,9 +7981,10 @@
     ],
     'kevin': ['app-crypt/trousers', 'chromeos-base/touch_firmware_calibration'],
     'eve': ['chromeos-base/st_flash'],
-    'ghost': ['chromeos-base/chargesplash'],
     'herobrine': ['chromeos-base/qc-modemfwd-helper'],
     'kukui': ['media-libs/cros-camera-hal-mtk'],
+    'nissa': ['chromeos-base/discod'],
+    'novato': ['chromeos-base/goldfishd'],
     'octopus': ['chromeos-base/rmad'],
     'reven': ['chromeos-base/flex_id'],
     'scarlet': ['media-libs/cros-camera-hal-rockchip-isp1'],