Marking set of ebuilds as stable Cr-Build-Url: https://cr-buildbucket.appspot.com/build/8805933297794347633 Cr-Automation-Id: cros_source/push_uprevs Change-Id: I6b77881089bbf9da2d0142366de07f46796faa09

commit: cf2bf61ca9de11376ae240f73694dbcfa656ced7 [log] [tgz]
author: chromeos-ci-prod <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Sat Aug 13 08:35:02 2022 -0700
committer: chromeos-ci-prod <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Sat Aug 13 08:35:02 2022 -0700
tree: 61408e42570efd93826f23c912068dc2a0bc715f
parent: 79e8303e9bb0173d6a9e589e12c7eda62cbf7249 [diff]
diff --git a/chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r177.ebuild b/chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r178.ebuild
similarity index 92%
rename from chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r177.ebuild
rename to chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r178.ebuild
index aee59a5..a20f5dc 100644
--- a/chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r177.ebuild
+++ b/chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r178.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("be0a51c6f8bf94ab19e7d38c575e1a602652383d" "a20bb10d95f22dc95f0f1779205b381f8c14569d" "181f7c798017c00372848000f4ba38b04936e5ab")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e982c0b168527570ec0e64866af23d7199ef2d42" "3ef88da49eee33eaeed09c00a9d40169450b7f5a")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "a20bb10d95f22dc95f0f1779205b381f8c14569d" "181f7c798017c00372848000f4ba38b04936e5ab")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e982c0b168527570ec0e64866af23d7199ef2d42" "3ef88da49eee33eaeed09c00a9d40169450b7f5a")
 inherit cros-constants
 
 CROS_WORKON_PROJECT=(

diff --git a/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r357.ebuild b/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r358.ebuild
similarity index 98%
rename from chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r357.ebuild
rename to chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r358.ebuild
index 4443bb6..fd8488b 100644
--- a/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r357.ebuild
+++ b/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r358.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("be0a51c6f8bf94ab19e7d38c575e1a602652383d" "a20bb10d95f22dc95f0f1779205b381f8c14569d" "181f7c798017c00372848000f4ba38b04936e5ab")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e982c0b168527570ec0e64866af23d7199ef2d42" "3ef88da49eee33eaeed09c00a9d40169450b7f5a")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "a20bb10d95f22dc95f0f1779205b381f8c14569d" "181f7c798017c00372848000f4ba38b04936e5ab")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e982c0b168527570ec0e64866af23d7199ef2d42" "3ef88da49eee33eaeed09c00a9d40169450b7f5a")
 inherit cros-constants
 
 CROS_WORKON_PROJECT=(

diff --git a/chromeos-base/arc-adbd/arc-adbd-0.0.1-r497.ebuild b/chromeos-base/arc-adbd/arc-adbd-0.0.1-r498.ebuild
similarity index 83%
rename from chromeos-base/arc-adbd/arc-adbd-0.0.1-r497.ebuild
rename to chromeos-base/arc-adbd/arc-adbd-0.0.1-r498.ebuild
index 11f3470..b88d104 100644
--- a/chromeos-base/arc-adbd/arc-adbd-0.0.1-r497.ebuild
+++ b/chromeos-base/arc-adbd/arc-adbd-0.0.1-r498.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9ffb67d6430bde120f7e5435dca1870fbcf571e1"
-CROS_WORKON_TREE=("514833ac35feb926ab49dcf952ef3768d02e9b84" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("514833ac35feb926ab49dcf952ef3768d02e9b84" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r496.ebuild b/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r497.ebuild
similarity index 87%
rename from chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r496.ebuild
rename to chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r497.ebuild
index aae42c4..a9b5e88 100644
--- a/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r496.ebuild
+++ b/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r497.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9ffb67d6430bde120f7e5435dca1870fbcf571e1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "ab6c050aa8c6ace38d371937e67cfb21e46fd899" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "ab6c050aa8c6ace38d371937e67cfb21e46fd899" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r430.ebuild b/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r431.ebuild
similarity index 88%
rename from chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r430.ebuild
rename to chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r431.ebuild
index 3a65c02..00b2e6e 100644
--- a/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r430.ebuild
+++ b/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r431.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="07e5c71a7363573786a46d1646e5049e54c5ef94"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "575718e277c169d180cb6adc060050e72686b317" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "575718e277c169d180cb6adc060050e72686b317" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-base/arc-base-0.0.1-r508.ebuild b/chromeos-base/arc-base/arc-base-0.0.1-r509.ebuild
similarity index 95%
rename from chromeos-base/arc-base/arc-base-0.0.1-r508.ebuild
rename to chromeos-base/arc-base/arc-base-0.0.1-r509.ebuild
index 8f45f22..1398534 100644
--- a/chromeos-base/arc-base/arc-base-0.0.1-r508.ebuild
+++ b/chromeos-base/arc-base/arc-base-0.0.1-r509.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e6009dda566e182775a3e0d822ab4ffbf051ee6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e6009dda566e182775a3e0d822ab4ffbf051ee6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r297.ebuild b/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r298.ebuild
similarity index 89%
rename from chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r297.ebuild
rename to chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r298.ebuild
index 14336e8..9cfba48b 100644
--- a/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r297.ebuild
+++ b/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r298.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "434170aa6f4b0783eb80a76648f8e27f71b420fd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "434170aa6f4b0783eb80a76648f8e27f71b420fd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r212.ebuild b/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r213.ebuild
similarity index 94%
rename from chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r212.ebuild
rename to chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r213.ebuild
index fae5574..91930af 100644
--- a/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r212.ebuild
+++ b/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r213.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a51f6b6dd9d0e920cbe996f244873d1fb0c8a7bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a51f6b6dd9d0e920cbe996f244873d1fb0c8a7bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 inherit cros-constants
 
 CROS_WORKON_INCREMENTAL_BUILD="1"

diff --git a/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r171.ebuild b/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r172.ebuild
similarity index 87%
rename from chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r171.ebuild
rename to chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r172.ebuild
index 139684d..1a89a0c 100644
--- a/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r171.ebuild
+++ b/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r172.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "cca15ee6031a3289ea3e45535963bb5874662caa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "cca15ee6031a3289ea3e45535963bb5874662caa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r380.ebuild b/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r381.ebuild
similarity index 96%
rename from chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r380.ebuild
rename to chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r381.ebuild
index 74c2096..a3cbebb 100644
--- a/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r380.ebuild
+++ b/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r381.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0912ccb6e2c303cfbbaa2bc878019e383aad07c6" "49dfc58d6c4c66f5d0b0d06f0161da4e602a1293")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "eb015c68db68f86b1e19e0200461bc65c136674b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "6dbc19849752c206e135ab59349ebb1cc62bb435")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "49dfc58d6c4c66f5d0b0d06f0161da4e602a1293")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "eb015c68db68f86b1e19e0200461bc65c136674b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "6dbc19849752c206e135ab59349ebb1cc62bb435")
 inherit cros-constants
 
 CROS_WORKON_INCREMENTAL_BUILD="1"

diff --git a/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r313.ebuild b/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r314.ebuild
similarity index 88%
rename from chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r313.ebuild
rename to chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r314.ebuild
index 8e2befa..5f6ce80 100644
--- a/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r313.ebuild
+++ b/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r314.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "97bcfd3487dc7a09335f29f44fc38eaabf21e90b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "97bcfd3487dc7a09335f29f44fc38eaabf21e90b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r574.ebuild b/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r575.ebuild
similarity index 91%
rename from chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r574.ebuild
rename to chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r575.ebuild
index 9b47a7c..d980ef2 100644
--- a/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r574.ebuild
+++ b/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r575.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "4407bbb4129cf62cb6e764ecfdb34edc5fbe318e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "4407bbb4129cf62cb6e764ecfdb34edc5fbe318e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r404.ebuild b/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r405.ebuild
similarity index 89%
rename from chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r404.ebuild
rename to chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r405.ebuild
index 0e16641..62e1d07 100644
--- a/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r404.ebuild
+++ b/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r405.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a668f1f1ed688f833488719ca2ccefc7e1e4272b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a668f1f1ed688f833488719ca2ccefc7e1e4272b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r406.ebuild b/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r407.ebuild
similarity index 90%
rename from chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r406.ebuild
rename to chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r407.ebuild
index f925fca..6211dac 100644
--- a/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r406.ebuild
+++ b/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r407.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a050dd7c355cb42fde90fdb9c3c4334389d0acb5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a050dd7c355cb42fde90fdb9c3c4334389d0acb5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r198.ebuild b/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r199.ebuild
similarity index 85%
rename from chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r198.ebuild
rename to chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r199.ebuild
index e11c5ea..8524a47 100644
--- a/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r198.ebuild
+++ b/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r199.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "cffb412aeb8981beccb3e710c15dbf0d33e790c6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "cffb412aeb8981beccb3e710c15dbf0d33e790c6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arc-setup/arc-setup-0.0.1-r1597.ebuild b/chromeos-base/arc-setup/arc-setup-0.0.1-r1598.ebuild
similarity index 96%
rename from chromeos-base/arc-setup/arc-setup-0.0.1-r1597.ebuild
rename to chromeos-base/arc-setup/arc-setup-0.0.1-r1598.ebuild
index 0a905c8..9d758d4 100644
--- a/chromeos-base/arc-setup/arc-setup-0.0.1-r1597.ebuild
+++ b/chromeos-base/arc-setup/arc-setup-0.0.1-r1598.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="07e5c71a7363573786a46d1646e5049e54c5ef94"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "07cb07d94b34715810e1a88257031e7091d1a5f5" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "07cb07d94b34715810e1a88257031e7091d1a5f5" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r221.ebuild b/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r222.ebuild
similarity index 90%
rename from chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r221.ebuild
rename to chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r222.ebuild
index ea652ee..b60731b 100644
--- a/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r221.ebuild
+++ b/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r222.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "88e843cfa45c09f42d875d1276aa8c51d84540c6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "88e843cfa45c09f42d875d1276aa8c51d84540c6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r259.ebuild b/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r260.ebuild
similarity index 92%
rename from chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r259.ebuild
rename to chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r260.ebuild
index 30cab67..fd0fec41 100644
--- a/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r259.ebuild
+++ b/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r260.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "6c8e31ddd8673a4d0a97c41281778e94def0e37a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "6c8e31ddd8673a4d0a97c41281778e94def0e37a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r159.ebuild b/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r160.ebuild
similarity index 88%
rename from chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r159.ebuild
rename to chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r160.ebuild
index 904e7b9..961c194 100644
--- a/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r159.ebuild
+++ b/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r160.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9f169e2d15cb3a0fb7ed9bf55a6a443166e10796" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9f169e2d15cb3a0fb7ed9bf55a6a443166e10796" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r182.ebuild b/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r183.ebuild
similarity index 88%
rename from chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r182.ebuild
rename to chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r183.ebuild
index fad970c72..06e4167 100644
--- a/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r182.ebuild
+++ b/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r183.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "52a8dfd1ecf17b48fee49f656fc032c0fab03760" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "52a8dfd1ecf17b48fee49f656fc032c0fab03760" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/atrusctl/atrusctl-0.0.1-r1087.ebuild b/chromeos-base/atrusctl/atrusctl-0.0.1-r1088.ebuild
similarity index 90%
rename from chromeos-base/atrusctl/atrusctl-0.0.1-r1087.ebuild
rename to chromeos-base/atrusctl/atrusctl-0.0.1-r1088.ebuild
index 482d9e7..77d6541 100644
--- a/chromeos-base/atrusctl/atrusctl-0.0.1-r1087.ebuild
+++ b/chromeos-base/atrusctl/atrusctl-0.0.1-r1088.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "4f1d81ecfa86ae7570f951fe6eaac9ab2c1290d7")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e791cbb573288deecc226b0d77ab4583fe9f747f")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "4f1d81ecfa86ae7570f951fe6eaac9ab2c1290d7")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e791cbb573288deecc226b0d77ab4583fe9f747f")
 CROS_WORKON_LOCALNAME=("platform2" "third_party/atrusctl")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/atrusctl")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/atrusctl")

diff --git a/chromeos-base/attestation-client/attestation-client-0.0.1-r512.ebuild b/chromeos-base/attestation-client/attestation-client-0.0.1-r513.ebuild
similarity index 93%
rename from chromeos-base/attestation-client/attestation-client-0.0.1-r512.ebuild
rename to chromeos-base/attestation-client/attestation-client-0.0.1-r513.ebuild
index 30a8a07..1281396 100644
--- a/chromeos-base/attestation-client/attestation-client-0.0.1-r512.ebuild
+++ b/chromeos-base/attestation-client/attestation-client-0.0.1-r513.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="58ff5798a92525a17159bdc1e94ae3e78a5e2477"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/attestation/attestation-0.0.1-r3622.ebuild b/chromeos-base/attestation/attestation-0.0.1-r3623.ebuild
similarity index 94%
rename from chromeos-base/attestation/attestation-0.0.1-r3622.ebuild
rename to chromeos-base/attestation/attestation-0.0.1-r3623.ebuild
index 9431792..db3a5ea 100644
--- a/chromeos-base/attestation/attestation-0.0.1-r3622.ebuild
+++ b/chromeos-base/attestation/attestation-0.0.1-r3623.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/authpolicy/authpolicy-0.0.1-r1871.ebuild b/chromeos-base/authpolicy/authpolicy-0.0.1-r1872.ebuild
similarity index 94%
rename from chromeos-base/authpolicy/authpolicy-0.0.1-r1871.ebuild
rename to chromeos-base/authpolicy/authpolicy-0.0.1-r1872.ebuild
index 4fe658b..3733143 100644
--- a/chromeos-base/authpolicy/authpolicy-0.0.1-r1871.ebuild
+++ b/chromeos-base/authpolicy/authpolicy-0.0.1-r1872.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="7926964ecffbefc48a3a389044c7223742faafc4"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "b264cb6b90c6ebf905cc374ca3ebd7011ea5fe8c" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "b264cb6b90c6ebf905cc374ca3ebd7011ea5fe8c" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3186.ebuild b/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3187.ebuild
similarity index 89%
rename from chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3186.ebuild
rename to chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3187.ebuild
index 4ea6751..7525b93 100644
--- a/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3186.ebuild
+++ b/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3187.ebuild

@@ -4,8 +4,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "b263bb463cd5e0028ada4a34df829a60185da23a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "b263bb463cd5e0028ada4a34df829a60185da23a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"

diff --git a/chromeos-base/biod/biod-0.0.1-r2427.ebuild b/chromeos-base/biod/biod-0.0.1-r2428.ebuild
similarity index 95%
rename from chromeos-base/biod/biod-0.0.1-r2427.ebuild
rename to chromeos-base/biod/biod-0.0.1-r2428.ebuild
index 524a24d..fe79a2a 100644
--- a/chromeos-base/biod/biod-0.0.1-r2427.ebuild
+++ b/chromeos-base/biod/biod-0.0.1-r2428.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="33c269d6685f571cacfe64880b0f19beb11437e9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "3e7613ea6e002e2ed9003c451537961ee1ec8c06" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "3e7613ea6e002e2ed9003c451537961ee1ec8c06" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/biod_proxy/biod_proxy-0.0.1-r358.ebuild b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r359.ebuild
similarity index 86%
rename from chromeos-base/biod_proxy/biod_proxy-0.0.1-r358.ebuild
rename to chromeos-base/biod_proxy/biod_proxy-0.0.1-r359.ebuild
index 4f4e3ba..154cec5a 100644
--- a/chromeos-base/biod_proxy/biod_proxy-0.0.1-r358.ebuild
+++ b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r359.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "3e7613ea6e002e2ed9003c451537961ee1ec8c06" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "3e7613ea6e002e2ed9003c451537961ee1ec8c06" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/bootid-logger/bootid-logger-0.0.1-r205.ebuild b/chromeos-base/bootid-logger/bootid-logger-0.0.1-r206.ebuild
similarity index 89%
rename from chromeos-base/bootid-logger/bootid-logger-0.0.1-r205.ebuild
rename to chromeos-base/bootid-logger/bootid-logger-0.0.1-r206.ebuild
index d719b2b..c223fd2 100644
--- a/chromeos-base/bootid-logger/bootid-logger-0.0.1-r205.ebuild
+++ b/chromeos-base/bootid-logger/bootid-logger-0.0.1-r206.ebuild

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "83ca22e88798e1cc90cb146bff627f7dca4893bc" "8ef7c6aabe0a8edeff8f6030f7c1b79ab3e32522" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "83ca22e88798e1cc90cb146bff627f7dca4893bc" "8ef7c6aabe0a8edeff8f6030f7c1b79ab3e32522" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1878.ebuild b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1879.ebuild
similarity index 91%
rename from chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1878.ebuild
rename to chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1879.ebuild
index 086c728..131a048 100644
--- a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1878.ebuild
+++ b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1879.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="560999fd91b1508d4844e5f3e449f3399f543c68"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "cae4613fb762e98fcafc23166e621aaa667b6729" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "cae4613fb762e98fcafc23166e621aaa667b6729" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/bootstat/bootstat-0.0.2-r3232.ebuild b/chromeos-base/bootstat/bootstat-0.0.2-r3233.ebuild
similarity index 86%
rename from chromeos-base/bootstat/bootstat-0.0.2-r3232.ebuild
rename to chromeos-base/bootstat/bootstat-0.0.2-r3233.ebuild
index 89dca12..0a450c9 100644
--- a/chromeos-base/bootstat/bootstat-0.0.2-r3232.ebuild
+++ b/chromeos-base/bootstat/bootstat-0.0.2-r3233.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "05c88bcfecc640205a21834d7f46a3d1e651f111" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "05c88bcfecc640205a21834d7f46a3d1e651f111" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/cbor/cbor-0.0.1-r219.ebuild b/chromeos-base/cbor/cbor-0.0.1-r220.ebuild
similarity index 90%
rename from chromeos-base/cbor/cbor-0.0.1-r219.ebuild
rename to chromeos-base/cbor/cbor-0.0.1-r220.ebuild
index 26a7c91..d5ad5f8 100644
--- a/chromeos-base/cbor/cbor-0.0.1-r219.ebuild
+++ b/chromeos-base/cbor/cbor-0.0.1-r220.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "35fe21779fddc0d376da13dab49e31fa3491205f")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fa22c2326c89f0ccbecf5d2e3635701867e62b85")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "35fe21779fddc0d376da13dab49e31fa3491205f")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fa22c2326c89f0ccbecf5d2e3635701867e62b85")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"chromiumos/platform/cbor"

diff --git a/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r215.ebuild b/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r216.ebuild
similarity index 88%
rename from chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r215.ebuild
rename to chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r216.ebuild
index f83ee07..c572935 100644
--- a/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r215.ebuild
+++ b/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r216.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "63862a9eebc1145ee434295657abeeefaf884645" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "63862a9eebc1145ee434295657abeeefaf884645" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/chaps-client/chaps-client-0.0.1-r141.ebuild b/chromeos-base/chaps-client/chaps-client-0.0.1-r142.ebuild
similarity index 90%
rename from chromeos-base/chaps-client/chaps-client-0.0.1-r141.ebuild
rename to chromeos-base/chaps-client/chaps-client-0.0.1-r142.ebuild
index 1b40cc8..fa1f43c 100644
--- a/chromeos-base/chaps-client/chaps-client-0.0.1-r141.ebuild
+++ b/chromeos-base/chaps-client/chaps-client-0.0.1-r142.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/chaps/chaps-0.0.1-r3765.ebuild b/chromeos-base/chaps/chaps-0.0.1-r3766.ebuild
similarity index 96%
rename from chromeos-base/chaps/chaps-0.0.1-r3765.ebuild
rename to chromeos-base/chaps/chaps-0.0.1-r3766.ebuild
index a395efb..709284a 100644
--- a/chromeos-base/chaps/chaps-0.0.1-r3765.ebuild
+++ b/chromeos-base/chaps/chaps-0.0.1-r3766.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "944879c9353c2df8adb7022407a8d319671325c1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "944879c9353c2df8adb7022407a8d319671325c1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/chargesplash/chargesplash-0.0.1-r30.ebuild b/chromeos-base/chargesplash/chargesplash-0.0.1-r31.ebuild
similarity index 86%
rename from chromeos-base/chargesplash/chargesplash-0.0.1-r30.ebuild
rename to chromeos-base/chargesplash/chargesplash-0.0.1-r31.ebuild
index 28f6895..8712a48 100644
--- a/chromeos-base/chargesplash/chargesplash-0.0.1-r30.ebuild
+++ b/chromeos-base/chargesplash/chargesplash-0.0.1-r31.ebuild

@@ -4,8 +4,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "83e2bdd8b74ac9fdb0c801679693d2bb0745064c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "83e2bdd8b74ac9fdb0c801679693d2bb0745064c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r397.ebuild b/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r398.ebuild
similarity index 91%
rename from chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r397.ebuild
rename to chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r398.ebuild
index 92f395a..e46a354 100644
--- a/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r397.ebuild
+++ b/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r398.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "777454ed89f9fb3a7f25a3f844449983a1f6c3fa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "777454ed89f9fb3a7f25a3f844449983a1f6c3fa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2139.ebuild b/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2140.ebuild
similarity index 89%
rename from chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2139.ebuild
rename to chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2140.ebuild
index 00b2dce..ac62804 100644
--- a/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2139.ebuild
+++ b/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2140.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT=("b78108f7b2a06e320400e3809d4ecc36f846d8f3" "6d09c3d7ced419a80157d7488c826c7086cd078c")
-CROS_WORKON_TREE=("4fdfdbe461ccedeaaf176391c0bbb0f74943be45" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "0bb1188da737e1a0399457e852e32dc8cfba2567" "f87095b8c1a06b38a8fe4183b31cdf15821ac9a1")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "a1298a3f48a90fb72cefbd674ebb0fcef18c214f")
+CROS_WORKON_TREE=("4fdfdbe461ccedeaaf176391c0bbb0f74943be45" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "0bb1188da737e1a0399457e852e32dc8cfba2567" "f87095b8c1a06b38a8fe4183b31cdf15821ac9a1")
 CROS_WORKON_INCREMENTAL_BUILD=1
 
 CROS_WORKON_PROJECT=(

diff --git a/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3250.ebuild b/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3251.ebuild
similarity index 90%
rename from chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3250.ebuild
rename to chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3251.ebuild
index bab1632..c9876b0 100644
--- a/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3250.ebuild
+++ b/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3251.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "7de555b069d818f590b242435b6c4ec9630b8ead" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "7de555b069d818f590b242435b6c4ec9630b8ead" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4579.ebuild b/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4580.ebuild
similarity index 97%
rename from chromeos-base/chromeos-init/chromeos-init-0.0.25-r4579.ebuild
rename to chromeos-base/chromeos-init/chromeos-init-0.0.25-r4580.ebuild
index 75596c5..54b4240 100644
--- a/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4579.ebuild
+++ b/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4580.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="709c9b55279309d92c25d38874a8350e10c9d6a9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9f635b4066a77f92e74cc7d80516960224bdf700" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9f635b4066a77f92e74cc7d80516960224bdf700" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3667.ebuild b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3668.ebuild
similarity index 92%
rename from chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3667.ebuild
rename to chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3668.ebuild
index e489da1..2507f44 100644
--- a/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3667.ebuild
+++ b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3668.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("527abd7a988a45572305a6c44b5324d0d9cf8be2" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "aec60c261c19c132b6dda00ed40f61717c823a15" "a65107acb3c4cbbae51687d8409856f07b5dda27" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("527abd7a988a45572305a6c44b5324d0d9cf8be2" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "aec60c261c19c132b6dda00ed40f61717c823a15" "a65107acb3c4cbbae51687d8409856f07b5dda27" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1

diff --git a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r5080.ebuild b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r5081.ebuild
similarity index 96%
rename from chromeos-base/chromeos-login/chromeos-login-0.0.2-r5080.ebuild
rename to chromeos-base/chromeos-login/chromeos-login-0.0.2-r5081.ebuild
index bcfefe4..13459f6 100644
--- a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r5080.ebuild
+++ b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r5081.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="223dc079ee4398a1ed98550a68f51618cef0f60b"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "86c7faad3e91503ff0fd5d28ede2e13016668322" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "86c7faad3e91503ff0fd5d28ede2e13016668322" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r385.ebuild b/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r386.ebuild
similarity index 88%
rename from chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r385.ebuild
rename to chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r386.ebuild
index 9678005..c5e917f 100644
--- a/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r385.ebuild
+++ b/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r386.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f008fb9e266cb811b8604fca21e59d8114dab267" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f008fb9e266cb811b8604fca21e59d8114dab267" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1765.ebuild b/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1766.ebuild
similarity index 88%
rename from chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1765.ebuild
rename to chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1766.ebuild
index ece0045..304676f 100644
--- a/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1765.ebuild
+++ b/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1766.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "1e69ede3d074afd135fa6f2136ea5d99c425702b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "1e69ede3d074afd135fa6f2136ea5d99c425702b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/codelab/codelab-0.0.1-r268.ebuild b/chromeos-base/codelab/codelab-0.0.1-r269.ebuild
similarity index 85%
rename from chromeos-base/codelab/codelab-0.0.1-r268.ebuild
rename to chromeos-base/codelab/codelab-0.0.1-r269.ebuild
index 99884d6..2ddb8db 100644
--- a/chromeos-base/codelab/codelab-0.0.1-r268.ebuild
+++ b/chromeos-base/codelab/codelab-0.0.1-r269.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "0bb4f1d027f4fd2368775ade6c2d929e5773cdf8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "0bb4f1d027f4fd2368775ade6c2d929e5773cdf8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3843.ebuild b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3844.ebuild
similarity index 97%
rename from chromeos-base/crash-reporter/crash-reporter-0.0.1-r3843.ebuild
rename to chromeos-base/crash-reporter/crash-reporter-0.0.1-r3844.ebuild
index 9687ed7..e1027f5 100644
--- a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3843.ebuild
+++ b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3844.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bd16db50819e8a16801faeb6c5b7f8c8a79b2210"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "b6de0ed9bf68f24a62063f5dd296e2f6c23120cb" "3b33fc07daf512e548300eefbd028b622bc51b44" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "b6de0ed9bf68f24a62063f5dd296e2f6c23120cb" "3b33fc07daf512e548300eefbd028b622bc51b44" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r152.ebuild b/chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r153.ebuild
similarity index 92%
rename from chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r152.ebuild
rename to chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r153.ebuild
index 554f942..a565566 100644
--- a/chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r152.ebuild
+++ b/chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r153.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "efe904e8c621b150b9937196a1b506dfbdc10ece" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "efe904e8c621b150b9937196a1b506dfbdc10ece" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/android common-mk"

diff --git a/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r553.ebuild b/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r554.ebuild
similarity index 95%
rename from chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r553.ebuild
rename to chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r554.ebuild
index 0af05ba..8b6a27d 100644
--- a/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r553.ebuild
+++ b/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r554.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "29d52c6d2464057e3fde8214a173f96d96f3b267" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "29d52c6d2464057e3fde8214a173f96d96f3b267" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn common-mk metrics camera/build camera/common camera/features camera/gpu camera/include camera/mojo chromeos-config iioservice/libiioservice_ipc iioservice/mojo"

diff --git a/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r469.ebuild b/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r470.ebuild
similarity index 82%
rename from chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r469.ebuild
rename to chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r470.ebuild
index 6b751e2..2b7bbec 100644
--- a/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r469.ebuild
+++ b/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r470.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="12a8d083f711ceb3a6ab9f0808f90568320d89a8"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "2de57cadefcee72268944188060875f71560d058" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "2de57cadefcee72268944188060875f71560d058" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/tools camera/include common-mk"

diff --git a/chromeos-base/cros-camera/cros-camera-0.0.1-r1270.ebuild b/chromeos-base/cros-camera/cros-camera-0.0.1-r1271.ebuild
similarity index 95%
rename from chromeos-base/cros-camera/cros-camera-0.0.1-r1270.ebuild
rename to chromeos-base/cros-camera/cros-camera-0.0.1-r1271.ebuild
index 460024d..15144bc 100644
--- a/chromeos-base/cros-camera/cros-camera-0.0.1-r1270.ebuild
+++ b/chromeos-base/cros-camera/cros-camera-0.0.1-r1271.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "b0ccef63d93d3f8d215dd201788aeebd15619f07" "c3c40f3f84e84244b8835207266a7094fa70773a" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "b0ccef63d93d3f8d215dd201788aeebd15619f07" "c3c40f3f84e84244b8835207266a7094fa70773a" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 # TODO(crbug.com/914263): camera/hal is unnecessary for this build but is

diff --git a/chromeos-base/cros-disks/cros-disks-0.0.1-r3512.ebuild b/chromeos-base/cros-disks/cros-disks-0.0.1-r3513.ebuild
similarity index 96%
rename from chromeos-base/cros-disks/cros-disks-0.0.1-r3512.ebuild
rename to chromeos-base/cros-disks/cros-disks-0.0.1-r3513.ebuild
index edf1288..47231be 100644
--- a/chromeos-base/cros-disks/cros-disks-0.0.1-r3512.ebuild
+++ b/chromeos-base/cros-disks/cros-disks-0.0.1-r3513.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9bbe3d4f06a612d74b364226851f121bd539e8c5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "8f2675a7fb1f6b8b5dda4c1070aaa0b8de796429" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "8f2675a7fb1f6b8b5dda4c1070aaa0b8de796429" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r157.ebuild b/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r158.ebuild
similarity index 91%
rename from chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r157.ebuild
rename to chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r158.ebuild
index 30a3a43..494cff0 100644
--- a/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r157.ebuild
+++ b/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r158.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="fed279f07ff9ff08f4e6498f43cb40deb5e0c6c3"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "22e73209a1f442bdb7f51b01281a5e5bae946c16" "ab344488dd853d41b3f2b2f42823fa2d2e1a9e88" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "22e73209a1f442bdb7f51b01281a5e5bae946c16" "ab344488dd853d41b3f2b2f42823fa2d2e1a9e88" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/crosdns/crosdns-0.0.2-r413.ebuild b/chromeos-base/crosdns/crosdns-0.0.2-r414.ebuild
similarity index 92%
rename from chromeos-base/crosdns/crosdns-0.0.2-r413.ebuild
rename to chromeos-base/crosdns/crosdns-0.0.2-r414.ebuild
index 159b72e..94a86c5 100644
--- a/chromeos-base/crosdns/crosdns-0.0.2-r413.ebuild
+++ b/chromeos-base/crosdns/crosdns-0.0.2-r414.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "8ef13102d74ef6d7591c8da21fadd38830971769" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "8ef13102d74ef6d7591c8da21fadd38830971769" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/croslog/croslog-0.0.1-r358.ebuild b/chromeos-base/croslog/croslog-0.0.1-r359.ebuild
similarity index 88%
rename from chromeos-base/croslog/croslog-0.0.1-r358.ebuild
rename to chromeos-base/croslog/croslog-0.0.1-r359.ebuild
index 21fd909..ea5a7f8 100644
--- a/chromeos-base/croslog/croslog-0.0.1-r358.ebuild
+++ b/chromeos-base/croslog/croslog-0.0.1-r359.ebuild

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "8ef7c6aabe0a8edeff8f6030f7c1b79ab3e32522" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "8ef7c6aabe0a8edeff8f6030f7c1b79ab3e32522" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2061.ebuild b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2062.ebuild
similarity index 90%
rename from chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2061.ebuild
rename to chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2062.ebuild
index ca362c9..90d8eb1 100644
--- a/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2061.ebuild
+++ b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2062.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="560999fd91b1508d4844e5f3e449f3399f543c68"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "cae4613fb762e98fcafc23166e621aaa667b6729" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "cae4613fb762e98fcafc23166e621aaa667b6729" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1924.ebuild b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1925.ebuild
similarity index 92%
rename from chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1924.ebuild
rename to chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1925.ebuild
index 3d5f709..df986fd 100644
--- a/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1924.ebuild
+++ b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1925.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="560999fd91b1508d4844e5f3e449f3399f543c68"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "cae4613fb762e98fcafc23166e621aaa667b6729" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "cae4613fb762e98fcafc23166e621aaa667b6729" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/cryptohome/cryptohome-0.0.1-r4467.ebuild b/chromeos-base/cryptohome/cryptohome-0.0.1-r4468.ebuild
similarity index 97%
rename from chromeos-base/cryptohome/cryptohome-0.0.1-r4467.ebuild
rename to chromeos-base/cryptohome/cryptohome-0.0.1-r4468.ebuild
index 8acefba..305b9f4 100644
--- a/chromeos-base/cryptohome/cryptohome-0.0.1-r4467.ebuild
+++ b/chromeos-base/cryptohome/cryptohome-0.0.1-r4468.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="560999fd91b1508d4844e5f3e449f3399f543c68"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "cae4613fb762e98fcafc23166e621aaa667b6729" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "cae4613fb762e98fcafc23166e621aaa667b6729" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/debugd-client/debugd-client-0.0.1-r2279.ebuild b/chromeos-base/debugd-client/debugd-client-0.0.1-r2280.ebuild
similarity index 90%
rename from chromeos-base/debugd-client/debugd-client-0.0.1-r2279.ebuild
rename to chromeos-base/debugd-client/debugd-client-0.0.1-r2280.ebuild
index 2515fc1..805d295 100644
--- a/chromeos-base/debugd-client/debugd-client-0.0.1-r2279.ebuild
+++ b/chromeos-base/debugd-client/debugd-client-0.0.1-r2280.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="71f6f0a97cce048c0b7e9af08b6572189d3c13a1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "96c52c174043d3401aeade9ce7790f8488305677" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "96c52c174043d3401aeade9ce7790f8488305677" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/debugd/debugd-0.0.1-r3346.ebuild b/chromeos-base/debugd/debugd-0.0.1-r3347.ebuild
similarity index 96%
rename from chromeos-base/debugd/debugd-0.0.1-r3346.ebuild
rename to chromeos-base/debugd/debugd-0.0.1-r3347.ebuild
index fb2d152..165b496 100644
--- a/chromeos-base/debugd/debugd-0.0.1-r3346.ebuild
+++ b/chromeos-base/debugd/debugd-0.0.1-r3347.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="71f6f0a97cce048c0b7e9af08b6572189d3c13a1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "96c52c174043d3401aeade9ce7790f8488305677" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "96c52c174043d3401aeade9ce7790f8488305677" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/dev-install/dev-install-0.0.1-r1340.ebuild b/chromeos-base/dev-install/dev-install-0.0.1-r1341.ebuild
similarity index 94%
rename from chromeos-base/dev-install/dev-install-0.0.1-r1340.ebuild
rename to chromeos-base/dev-install/dev-install-0.0.1-r1341.ebuild
index a067f89..ce7ca21 100644
--- a/chromeos-base/dev-install/dev-install-0.0.1-r1340.ebuild
+++ b/chromeos-base/dev-install/dev-install-0.0.1-r1341.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "42d7c5735687e4d0b875e7985955ca1da771f93f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "42d7c5735687e4d0b875e7985955ca1da771f93f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1

diff --git a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1020.ebuild b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1021.ebuild
similarity index 88%
rename from chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1020.ebuild
rename to chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1021.ebuild
index 26dc8b8..0c7eef2 100644
--- a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1020.ebuild
+++ b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1021.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="52616c3ec16e7dd73a782baaf3d3c491ad10fa8f"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9ca3931359eba7f30b4f9b57e401d2ed7eebdd0b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9ca3931359eba7f30b4f9b57e401d2ed7eebdd0b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r144.ebuild b/chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r145.ebuild
similarity index 85%
rename from chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r144.ebuild
rename to chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r145.ebuild
index a6c1ad5..312515f 100644
--- a/chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r144.ebuild
+++ b/chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r145.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="52616c3ec16e7dd73a782baaf3d3c491ad10fa8f"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9ca3931359eba7f30b4f9b57e401d2ed7eebdd0b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9ca3931359eba7f30b4f9b57e401d2ed7eebdd0b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/diagnostics/diagnostics-0.0.1-r1466.ebuild b/chromeos-base/diagnostics/diagnostics-0.0.1-r1467.ebuild
similarity index 94%
rename from chromeos-base/diagnostics/diagnostics-0.0.1-r1466.ebuild
rename to chromeos-base/diagnostics/diagnostics-0.0.1-r1467.ebuild
index 0e284c5..ff0e38e 100644
--- a/chromeos-base/diagnostics/diagnostics-0.0.1-r1466.ebuild
+++ b/chromeos-base/diagnostics/diagnostics-0.0.1-r1467.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="52616c3ec16e7dd73a782baaf3d3c491ad10fa8f"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "9ca3931359eba7f30b4f9b57e401d2ed7eebdd0b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "9ca3931359eba7f30b4f9b57e401d2ed7eebdd0b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/discod/discod-0.0.1-r14.ebuild b/chromeos-base/discod/discod-0.0.1-r15.ebuild
similarity index 89%
rename from chromeos-base/discod/discod-0.0.1-r14.ebuild
rename to chromeos-base/discod/discod-0.0.1-r15.ebuild
index 3d61ba1..268e22e 100644
--- a/chromeos-base/discod/discod-0.0.1-r14.ebuild
+++ b/chromeos-base/discod/discod-0.0.1-r15.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f4ba6db7b497b0e4766bbe391578c35c02795df9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "8b4967427a3d2dad96feaf0caf2e514e9e6f052e" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "8b4967427a3d2dad96feaf0caf2e514e9e6f052e" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/disk_updater/disk_updater-0.0.1-r3196.ebuild b/chromeos-base/disk_updater/disk_updater-0.0.1-r3197.ebuild
similarity index 90%
rename from chromeos-base/disk_updater/disk_updater-0.0.1-r3196.ebuild
rename to chromeos-base/disk_updater/disk_updater-0.0.1-r3197.ebuild
index 3353a63..e7f78f0 100644
--- a/chromeos-base/disk_updater/disk_updater-0.0.1-r3196.ebuild
+++ b/chromeos-base/disk_updater/disk_updater-0.0.1-r3197.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "7222defad0516675cbd74df61b74d388be5eae64" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "7222defad0516675cbd74df61b74d388be5eae64" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r599.ebuild b/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r600.ebuild
similarity index 88%
rename from chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r599.ebuild
rename to chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r600.ebuild
index abab1d4..6c598c2 100644
--- a/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r599.ebuild
+++ b/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r600.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "be66f552f2c2ee937edafa582658f67dad6bf29e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "be66f552f2c2ee937edafa582658f67dad6bf29e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/dlcservice/dlcservice-0.0.1-r793.ebuild b/chromeos-base/dlcservice/dlcservice-0.0.1-r794.ebuild
similarity index 94%
rename from chromeos-base/dlcservice/dlcservice-0.0.1-r793.ebuild
rename to chromeos-base/dlcservice/dlcservice-0.0.1-r794.ebuild
index b8be9d2..225ca2d6 100644
--- a/chromeos-base/dlcservice/dlcservice-0.0.1-r793.ebuild
+++ b/chromeos-base/dlcservice/dlcservice-0.0.1-r794.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="709c9b55279309d92c25d38874a8350e10c9d6a9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "be66f552f2c2ee937edafa582658f67dad6bf29e" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "be66f552f2c2ee937edafa582658f67dad6bf29e" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/dlp/dlp-0.0.1-r165.ebuild b/chromeos-base/dlp/dlp-0.0.1-r166.ebuild
similarity index 93%
rename from chromeos-base/dlp/dlp-0.0.1-r165.ebuild
rename to chromeos-base/dlp/dlp-0.0.1-r166.ebuild
index aac4b7c..9ed7b4a 100644
--- a/chromeos-base/dlp/dlp-0.0.1-r165.ebuild
+++ b/chromeos-base/dlp/dlp-0.0.1-r166.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bd1e9c1e5b99575aae4c3cbd6a2c102d567a7517"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "179a073f51a15a90cbbdf56fba124d9d71ba4c92" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "179a073f51a15a90cbbdf56fba124d9d71ba4c92" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/dns-proxy/dns-proxy-0.0.1-r342.ebuild b/chromeos-base/dns-proxy/dns-proxy-0.0.1-r343.ebuild
similarity index 93%
rename from chromeos-base/dns-proxy/dns-proxy-0.0.1-r342.ebuild
rename to chromeos-base/dns-proxy/dns-proxy-0.0.1-r343.ebuild
index 1ddef06..a33ff28 100644
--- a/chromeos-base/dns-proxy/dns-proxy-0.0.1-r342.ebuild
+++ b/chromeos-base/dns-proxy/dns-proxy-0.0.1-r343.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "235fefd7a1a3627928bea9ea768909f97eb5a889" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "62f84a7b4216d539df553a5bafe00d85969a9f63" "bf11ffe5bade82cef5574e57f94fd0e7e38b716c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "235fefd7a1a3627928bea9ea768909f97eb5a889" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "62f84a7b4216d539df553a5bafe00d85969a9f63" "bf11ffe5bade82cef5574e57f94fd0e7e38b716c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/easy-unlock/easy-unlock-0.0.1-r3099.ebuild b/chromeos-base/easy-unlock/easy-unlock-0.0.1-r3100.ebuild
similarity index 88%
rename from chromeos-base/easy-unlock/easy-unlock-0.0.1-r3099.ebuild
rename to chromeos-base/easy-unlock/easy-unlock-0.0.1-r3100.ebuild
index be3b5fb..3b781c6 100644
--- a/chromeos-base/easy-unlock/easy-unlock-0.0.1-r3099.ebuild
+++ b/chromeos-base/easy-unlock/easy-unlock-0.0.1-r3100.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "ead09467b3f58a6e812f692940d708f1c286b94d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "ead09467b3f58a6e812f692940d708f1c286b94d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r292.ebuild b/chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r293.ebuild
similarity index 91%
rename from chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r292.ebuild
rename to chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r293.ebuild
index 110333a..f30beb6 100644
--- a/chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r292.ebuild
+++ b/chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r293.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="33c269d6685f571cacfe64880b0f19beb11437e9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/feature_usage/feature_usage-0.0.1-r76.ebuild b/chromeos-base/feature_usage/feature_usage-0.0.1-r77.ebuild
similarity index 89%
rename from chromeos-base/feature_usage/feature_usage-0.0.1-r76.ebuild
rename to chromeos-base/feature_usage/feature_usage-0.0.1-r77.ebuild
index 4c8a5eb..1df880c 100644
--- a/chromeos-base/feature_usage/feature_usage-0.0.1-r76.ebuild
+++ b/chromeos-base/feature_usage/feature_usage-0.0.1-r77.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9487cb70b8720982545a04ade6a4f464cdde53ac" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9487cb70b8720982545a04ade6a4f464cdde53ac" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/featured/featured-0.0.1-r123.ebuild b/chromeos-base/featured/featured-0.0.1-r124.ebuild
similarity index 92%
rename from chromeos-base/featured/featured-0.0.1-r123.ebuild
rename to chromeos-base/featured/featured-0.0.1-r124.ebuild
index a67dd85..0cfc8c8 100644
--- a/chromeos-base/featured/featured-0.0.1-r123.ebuild
+++ b/chromeos-base/featured/featured-0.0.1-r124.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="546ddd233756de145213b55bc9665055cdf38408"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "545d67a6429090226f1d6ac899f5f2d86bd38b99" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "545d67a6429090226f1d6ac899f5f2d86bd38b99" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/federated-service/federated-service-0.0.1-r141.ebuild b/chromeos-base/federated-service/federated-service-0.0.1-r142.ebuild
similarity index 91%
rename from chromeos-base/federated-service/federated-service-0.0.1-r141.ebuild
rename to chromeos-base/federated-service/federated-service-0.0.1-r142.ebuild
index 653919c..0a4897d 100644
--- a/chromeos-base/federated-service/federated-service-0.0.1-r141.ebuild
+++ b/chromeos-base/federated-service/federated-service-0.0.1-r142.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "01406a223aab1eb5a4a224b0e216d352c178037f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "01406a223aab1eb5a4a224b0e216d352c178037f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/feedback/feedback-0.0.1-r937.ebuild b/chromeos-base/feedback/feedback-0.0.1-r938.ebuild
similarity index 85%
rename from chromeos-base/feedback/feedback-0.0.1-r937.ebuild
rename to chromeos-base/feedback/feedback-0.0.1-r938.ebuild
index dd00fb8..bf52623 100644
--- a/chromeos-base/feedback/feedback-0.0.1-r937.ebuild
+++ b/chromeos-base/feedback/feedback-0.0.1-r938.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "5395cfe3ef077195924f7da08cada1ec5b1ded6d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "5395cfe3ef077195924f7da08cada1ec5b1ded6d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/flex_id/flex_id-0.0.1-r55.ebuild b/chromeos-base/flex_id/flex_id-0.0.1-r56.ebuild
similarity index 85%
rename from chromeos-base/flex_id/flex_id-0.0.1-r55.ebuild
rename to chromeos-base/flex_id/flex_id-0.0.1-r56.ebuild
index ebe9477..4e1a202 100644
--- a/chromeos-base/flex_id/flex_id-0.0.1-r55.ebuild
+++ b/chromeos-base/flex_id/flex_id-0.0.1-r56.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "c5a49444cc51d4d5d217c797f33502ff7e8a3dbc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "c5a49444cc51d4d5d217c797f33502ff7e8a3dbc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r176.ebuild b/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r177.ebuild
similarity index 88%
rename from chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r176.ebuild
rename to chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r177.ebuild
index 4826cb2..8ec19c8 100644
--- a/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r176.ebuild
+++ b/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r177.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "3b4d7f82f5d68f35d2412d679e794ec15a3a45e0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "3b4d7f82f5d68f35d2412d679e794ec15a3a45e0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/fusebox/fusebox-0.0.2-r234.ebuild b/chromeos-base/fusebox/fusebox-0.0.2-r235.ebuild
similarity index 89%
rename from chromeos-base/fusebox/fusebox-0.0.2-r234.ebuild
rename to chromeos-base/fusebox/fusebox-0.0.2-r235.ebuild
index 00d1be2..b06ce60 100644
--- a/chromeos-base/fusebox/fusebox-0.0.2-r234.ebuild
+++ b/chromeos-base/fusebox/fusebox-0.0.2-r235.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "86c75ff12317f1fc3eae5f0d87b89682b86dd88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "86c75ff12317f1fc3eae5f0d87b89682b86dd88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/g2f_tools/g2f_tools-0.0.1-r891.ebuild b/chromeos-base/g2f_tools/g2f_tools-0.0.1-r892.ebuild
similarity index 90%
rename from chromeos-base/g2f_tools/g2f_tools-0.0.1-r891.ebuild
rename to chromeos-base/g2f_tools/g2f_tools-0.0.1-r892.ebuild
index dd75b65..5453781 100644
--- a/chromeos-base/g2f_tools/g2f_tools-0.0.1-r891.ebuild
+++ b/chromeos-base/g2f_tools/g2f_tools-0.0.1-r892.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "b5881b78580dbead29183a70fdc260387f29d82a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "b5881b78580dbead29183a70fdc260387f29d82a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/glib-bridge/glib-bridge-0.0.1-r319.ebuild b/chromeos-base/glib-bridge/glib-bridge-0.0.1-r320.ebuild
similarity index 88%
rename from chromeos-base/glib-bridge/glib-bridge-0.0.1-r319.ebuild
rename to chromeos-base/glib-bridge/glib-bridge-0.0.1-r320.ebuild
index eb1fac6..26bd68a 100644
--- a/chromeos-base/glib-bridge/glib-bridge-0.0.1-r319.ebuild
+++ b/chromeos-base/glib-bridge/glib-bridge-0.0.1-r320.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "36dc2ec558e1f7491a9167556fd841be0c78aec5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "36dc2ec558e1f7491a9167556fd841be0c78aec5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1

diff --git a/chromeos-base/goldfishd/goldfishd-0.0.1-r623.ebuild b/chromeos-base/goldfishd/goldfishd-0.0.1-r624.ebuild
similarity index 85%
rename from chromeos-base/goldfishd/goldfishd-0.0.1-r623.ebuild
rename to chromeos-base/goldfishd/goldfishd-0.0.1-r624.ebuild
index 21b06ff..c377d3c 100644
--- a/chromeos-base/goldfishd/goldfishd-0.0.1-r623.ebuild
+++ b/chromeos-base/goldfishd/goldfishd-0.0.1-r624.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "d73e948ee4d98ed9a0b228cf85588b9ceeae13c3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "d73e948ee4d98ed9a0b228cf85588b9ceeae13c3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r700.ebuild b/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r701.ebuild
similarity index 90%
rename from chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r700.ebuild
rename to chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r701.ebuild
index 1517e1e..d6b2eb5 100644
--- a/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r700.ebuild
+++ b/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r701.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "012c74a2d8eae81ede02bdd5d5fdcdaeafd46f34" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "012c74a2d8eae81ede02bdd5d5fdcdaeafd46f34" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/hammerd/hammerd-0.0.1-r1162.ebuild b/chromeos-base/hammerd/hammerd-0.0.1-r1163.ebuild
similarity index 91%
rename from chromeos-base/hammerd/hammerd-0.0.1-r1162.ebuild
rename to chromeos-base/hammerd/hammerd-0.0.1-r1163.ebuild
index 2838bb6..75a1b96 100644
--- a/chromeos-base/hammerd/hammerd-0.0.1-r1162.ebuild
+++ b/chromeos-base/hammerd/hammerd-0.0.1-r1163.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "012c74a2d8eae81ede02bdd5d5fdcdaeafd46f34" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "012c74a2d8eae81ede02bdd5d5fdcdaeafd46f34" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r574.ebuild b/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r575.ebuild
similarity index 92%
rename from chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r574.ebuild
rename to chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r575.ebuild
index aad88e0..fd87bd2 100644
--- a/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r574.ebuild
+++ b/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r575.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "68361c6922909c829d679a3b5f79a5a64e977c35" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "68361c6922909c829d679a3b5f79a5a64e977c35" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r382.ebuild b/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r383.ebuild
similarity index 88%
rename from chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r382.ebuild
rename to chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r383.ebuild
index 7119a1d..fb3f113 100644
--- a/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r382.ebuild
+++ b/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r383.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "68361c6922909c829d679a3b5f79a5a64e977c35" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "68361c6922909c829d679a3b5f79a5a64e977c35" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/hardware_verifier/..."
 )

diff --git a/chromeos-base/hiberman-client/hiberman-client-0.0.1-r95.ebuild b/chromeos-base/hiberman-client/hiberman-client-0.0.1-r96.ebuild
similarity index 87%
rename from chromeos-base/hiberman-client/hiberman-client-0.0.1-r95.ebuild
rename to chromeos-base/hiberman-client/hiberman-client-0.0.1-r96.ebuild
index f8c6dd0..ef70cda 100644
--- a/chromeos-base/hiberman-client/hiberman-client-0.0.1-r95.ebuild
+++ b/chromeos-base/hiberman-client/hiberman-client-0.0.1-r96.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="be0a51c6f8bf94ab19e7d38c575e1a602652383d"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "08bdf83cf4f403dd53e27531e66f3a1fd9a23881" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "08bdf83cf4f403dd53e27531e66f3a1fd9a23881" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/hps-tool/hps-tool-0.0.1-r348.ebuild b/chromeos-base/hps-tool/hps-tool-0.0.1-r349.ebuild
similarity index 86%
rename from chromeos-base/hps-tool/hps-tool-0.0.1-r348.ebuild
rename to chromeos-base/hps-tool/hps-tool-0.0.1-r349.ebuild
index 654e114..271094a 100644
--- a/chromeos-base/hps-tool/hps-tool-0.0.1-r348.ebuild
+++ b/chromeos-base/hps-tool/hps-tool-0.0.1-r349.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "ddbdbd7f7519a0d8da3e33b0eaf9c5a88dc3084e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "ddbdbd7f7519a0d8da3e33b0eaf9c5a88dc3084e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/hpsd/hpsd-0.0.1-r336.ebuild b/chromeos-base/hpsd/hpsd-0.0.1-r337.ebuild
similarity index 86%
rename from chromeos-base/hpsd/hpsd-0.0.1-r336.ebuild
rename to chromeos-base/hpsd/hpsd-0.0.1-r337.ebuild
index 4e1fba3..73eaf82 100644
--- a/chromeos-base/hpsd/hpsd-0.0.1-r336.ebuild
+++ b/chromeos-base/hpsd/hpsd-0.0.1-r337.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ddbdbd7f7519a0d8da3e33b0eaf9c5a88dc3084e" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ddbdbd7f7519a0d8da3e33b0eaf9c5a88dc3084e" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn hps common-mk metrics"

diff --git a/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r525.ebuild b/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r526.ebuild
similarity index 88%
rename from chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r525.ebuild
rename to chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r526.ebuild
index d9b8846..e8a7dad 100644
--- a/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r525.ebuild
+++ b/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r526.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("46debaa1a374952167d5a2ca0bdf36013f053bc3" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "d3dca65ea14d72be7cfe4a01dcee20b783804e56" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("46debaa1a374952167d5a2ca0bdf36013f053bc3" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "d3dca65ea14d72be7cfe4a01dcee20b783804e56" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/iioservice/iioservice-0.0.1-r405.ebuild b/chromeos-base/iioservice/iioservice-0.0.1-r406.ebuild
similarity index 91%
rename from chromeos-base/iioservice/iioservice-0.0.1-r405.ebuild
rename to chromeos-base/iioservice/iioservice-0.0.1-r406.ebuild
index d61c20e6..4c62d7f 100644
--- a/chromeos-base/iioservice/iioservice-0.0.1-r405.ebuild
+++ b/chromeos-base/iioservice/iioservice-0.0.1-r406.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("bfd9042ec7fdd477ffa54e02ec0d6358aff22060" "5e9a89d06c41edf5cf43da8acf5f26ed104887e6")
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "693bb2d63562c6eff050d04f75aab1e9251e6548")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "5e9a89d06c41edf5cf43da8acf5f26ed104887e6")
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "693bb2d63562c6eff050d04f75aab1e9251e6548")
 inherit cros-constants
 
 CROS_WORKON_PROJECT=(

diff --git a/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r281.ebuild b/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r282.ebuild
similarity index 87%
rename from chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r281.ebuild
rename to chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r282.ebuild
index a50203c..52d331a 100644
--- a/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r281.ebuild
+++ b/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r282.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bfd9042ec7fdd477ffa54e02ec0d6358aff22060"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/imageloader-client/imageloader-client-0.0.1-r784.ebuild b/chromeos-base/imageloader-client/imageloader-client-0.0.1-r785.ebuild
similarity index 89%
rename from chromeos-base/imageloader-client/imageloader-client-0.0.1-r784.ebuild
rename to chromeos-base/imageloader-client/imageloader-client-0.0.1-r785.ebuild
index 1abab11..6da27cb 100644
--- a/chromeos-base/imageloader-client/imageloader-client-0.0.1-r784.ebuild
+++ b/chromeos-base/imageloader-client/imageloader-client-0.0.1-r785.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9ffb67d6430bde120f7e5435dca1870fbcf571e1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "bc5f4dc1eac5097a6d543202f4a5a5a4460f724b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "bc5f4dc1eac5097a6d543202f4a5a5a4460f724b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/imageloader/imageloader-0.0.1-r1744.ebuild b/chromeos-base/imageloader/imageloader-0.0.1-r1745.ebuild
similarity index 91%
rename from chromeos-base/imageloader/imageloader-0.0.1-r1744.ebuild
rename to chromeos-base/imageloader/imageloader-0.0.1-r1745.ebuild
index 56028fb..d2516ae 100644
--- a/chromeos-base/imageloader/imageloader-0.0.1-r1744.ebuild
+++ b/chromeos-base/imageloader/imageloader-0.0.1-r1745.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9ffb67d6430bde120f7e5435dca1870fbcf571e1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "bc5f4dc1eac5097a6d543202f4a5a5a4460f724b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "bc5f4dc1eac5097a6d543202f4a5a5a4460f724b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r169.ebuild b/chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r170.ebuild
similarity index 93%
rename from chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r169.ebuild
rename to chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r170.ebuild
index f778aff..4738f27 100644
--- a/chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r169.ebuild
+++ b/chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r170.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 inherit base cros-workon platform unpacker
 
 DESCRIPTION="Intel NNAPI HAL"

diff --git a/chromeos-base/kerberos/kerberos-0.0.1-r551.ebuild b/chromeos-base/kerberos/kerberos-0.0.1-r552.ebuild
similarity index 95%
rename from chromeos-base/kerberos/kerberos-0.0.1-r551.ebuild
rename to chromeos-base/kerberos/kerberos-0.0.1-r552.ebuild
index de85494..76674fa 100644
--- a/chromeos-base/kerberos/kerberos-0.0.1-r551.ebuild
+++ b/chromeos-base/kerberos/kerberos-0.0.1-r552.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "ac73f1a95b3439bdecc48d4cf6569e1f971592eb" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "ac73f1a95b3439bdecc48d4cf6569e1f971592eb" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r180.ebuild b/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r181.ebuild
similarity index 89%
rename from chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r180.ebuild
rename to chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r181.ebuild
index f4b2d4f..621089f 100644
--- a/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r180.ebuild
+++ b/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r181.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "f131d8f851366e6a2f8e8fa8f3042285d021d6c6")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4c04b0ebf35112629d2f6bc7e478514dcb5805cb")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "f131d8f851366e6a2f8e8fa8f3042285d021d6c6")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4c04b0ebf35112629d2f6bc7e478514dcb5805cb")
 CROS_WORKON_LOCALNAME=("platform2" "third_party/lexmark-fax-pnh")
 CROS_WORKON_EGIT_BRANCH=("main" "master")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/lexmark-fax-pnh")

diff --git a/chromeos-base/libbrillo/libbrillo-0.0.1-r2029.ebuild b/chromeos-base/libbrillo/libbrillo-0.0.1-r2030.ebuild
similarity index 95%
rename from chromeos-base/libbrillo/libbrillo-0.0.1-r2029.ebuild
rename to chromeos-base/libbrillo/libbrillo-0.0.1-r2030.ebuild
index e12ff1a..65ba054 100644
--- a/chromeos-base/libbrillo/libbrillo-0.0.1-r2029.ebuild
+++ b/chromeos-base/libbrillo/libbrillo-0.0.1-r2030.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="7fe1b0b9f6c62748cd6295b1da1d962f88226e66"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "050f07f750a45e74a69740b46ab28a09844213a9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "050f07f750a45e74a69740b46ab28a09844213a9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libchrome/libchrome-0.0.1-r416.ebuild b/chromeos-base/libchrome/libchrome-0.0.1-r417.ebuild
similarity index 97%
rename from chromeos-base/libchrome/libchrome-0.0.1-r416.ebuild
rename to chromeos-base/libchrome/libchrome-0.0.1-r417.ebuild
index dcba34e..284466e 100644
--- a/chromeos-base/libchrome/libchrome-0.0.1-r416.ebuild
+++ b/chromeos-base/libchrome/libchrome-0.0.1-r417.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("e60829824f23711e92b3cf5b0757adf8e40d789f" "036c6524d3b0cbd41e781612fb1be87f2b46027a")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "021b14c95e2a0a46d07c3d8a1e749be44c1e96b4")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "036c6524d3b0cbd41e781612fb1be87f2b46027a")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "021b14c95e2a0a46d07c3d8a1e749be44c1e96b4")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/platform/libchrome")
 CROS_WORKON_LOCALNAME=("platform2" "platform/libchrome")
 CROS_WORKON_EGIT_BRANCH=("main" "main")

diff --git a/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1926.ebuild b/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1927.ebuild
similarity index 89%
rename from chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1926.ebuild
rename to chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1927.ebuild
index 31f0855..e69cc6d 100644
--- a/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1926.ebuild
+++ b/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1927.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2361f68127fc1aaed7591baf3a4ad462108f161a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2361f68127fc1aaed7591baf3a4ad462108f161a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libcontainer/libcontainer-0.0.1-r1691.ebuild b/chromeos-base/libcontainer/libcontainer-0.0.1-r1692.ebuild
similarity index 89%
rename from chromeos-base/libcontainer/libcontainer-0.0.1-r1691.ebuild
rename to chromeos-base/libcontainer/libcontainer-0.0.1-r1692.ebuild
index d6a7940..dfa37a8 100644
--- a/chromeos-base/libcontainer/libcontainer-0.0.1-r1691.ebuild
+++ b/chromeos-base/libcontainer/libcontainer-0.0.1-r1692.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/libcrossystem/libcrossystem-0.0.1-r49.ebuild b/chromeos-base/libcrossystem/libcrossystem-0.0.1-r50.ebuild
similarity index 86%
rename from chromeos-base/libcrossystem/libcrossystem-0.0.1-r49.ebuild
rename to chromeos-base/libcrossystem/libcrossystem-0.0.1-r50.ebuild
index bb47d62..87311f7 100644
--- a/chromeos-base/libcrossystem/libcrossystem-0.0.1-r49.ebuild
+++ b/chromeos-base/libcrossystem/libcrossystem-0.0.1-r50.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "3b33fc07daf512e548300eefbd028b622bc51b44" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "3b33fc07daf512e548300eefbd028b622bc51b44" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libec/libec-0.0.1-r236.ebuild b/chromeos-base/libec/libec-0.0.1-r237.ebuild
similarity index 81%
rename from chromeos-base/libec/libec-0.0.1-r236.ebuild
rename to chromeos-base/libec/libec-0.0.1-r237.ebuild
index fe062c7..e2eb133 100644
--- a/chromeos-base/libec/libec-0.0.1-r236.ebuild
+++ b/chromeos-base/libec/libec-0.0.1-r237.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="33c269d6685f571cacfe64880b0f19beb11437e9"
-CROS_WORKON_TREE=("3e7613ea6e002e2ed9003c451537961ee1ec8c06" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("3e7613ea6e002e2ed9003c451537961ee1ec8c06" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r310.ebuild b/chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r311.ebuild
similarity index 89%
rename from chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r310.ebuild
rename to chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r311.ebuild
index 2f20f21..aa66b231 100644
--- a/chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r310.ebuild
+++ b/chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r311.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libhwsec/libhwsec-0.0.1-r438.ebuild b/chromeos-base/libhwsec/libhwsec-0.0.1-r439.ebuild
similarity index 91%
rename from chromeos-base/libhwsec/libhwsec-0.0.1-r438.ebuild
rename to chromeos-base/libhwsec/libhwsec-0.0.1-r439.ebuild
index 171ba3a..7873700 100644
--- a/chromeos-base/libhwsec/libhwsec-0.0.1-r438.ebuild
+++ b/chromeos-base/libhwsec/libhwsec-0.0.1-r439.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "b2ae20cf5a237ca246eecb61de48d18247370fd5" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "b2ae20cf5a237ca246eecb61de48d18247370fd5" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r324.ebuild b/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r325.ebuild
similarity index 82%
rename from chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r324.ebuild
rename to chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r325.ebuild
index 34f1b3e..ccbb4c1 100644
--- a/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r324.ebuild
+++ b/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r325.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bfd9042ec7fdd477ffa54e02ec0d6358aff22060"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn iioservice common-mk"

diff --git a/chromeos-base/libipp/libipp-0.0.1-r277.ebuild b/chromeos-base/libipp/libipp-0.0.1-r278.ebuild
similarity index 87%
rename from chromeos-base/libipp/libipp-0.0.1-r277.ebuild
rename to chromeos-base/libipp/libipp-0.0.1-r278.ebuild
index 2704ed0..392f984 100644
--- a/chromeos-base/libipp/libipp-0.0.1-r277.ebuild
+++ b/chromeos-base/libipp/libipp-0.0.1-r278.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a6691fe1e00666995d1480ebcc515c990861e702" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a6691fe1e00666995d1480ebcc515c990861e702" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libmems/libmems-0.0.1-r317.ebuild b/chromeos-base/libmems/libmems-0.0.1-r318.ebuild
similarity index 86%
rename from chromeos-base/libmems/libmems-0.0.1-r317.ebuild
rename to chromeos-base/libmems/libmems-0.0.1-r318.ebuild
index a356c00..68ed2c6 100644
--- a/chromeos-base/libmems/libmems-0.0.1-r317.ebuild
+++ b/chromeos-base/libmems/libmems-0.0.1-r318.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bfd9042ec7fdd477ffa54e02ec0d6358aff22060"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r559.ebuild b/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r560.ebuild
similarity index 92%
rename from chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r559.ebuild
rename to chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r560.ebuild
index eda9506..72e629d 100644
--- a/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r559.ebuild
+++ b/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r560.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r565.ebuild b/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r566.ebuild
similarity index 93%
rename from chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r565.ebuild
rename to chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r566.ebuild
index 673aaf3..601ace2a 100644
--- a/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r565.ebuild
+++ b/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r566.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "b90d0e8f789e8cfe86794cb3f36ae69967b7dc36" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "b90d0e8f789e8cfe86794cb3f36ae69967b7dc36" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r358.ebuild b/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r359.ebuild
similarity index 87%
rename from chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r358.ebuild
rename to chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r359.ebuild
index f611880..c1f3169 100644
--- a/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r358.ebuild
+++ b/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r359.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "4b86eae6fc1a2faee58169d41c841c86ad9bc73c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "4b86eae6fc1a2faee58169d41c841c86ad9bc73c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/libvda/libvda-0.0.1-r365.ebuild b/chromeos-base/libvda/libvda-0.0.1-r366.ebuild
similarity index 90%
rename from chromeos-base/libvda/libvda-0.0.1-r365.ebuild
rename to chromeos-base/libvda/libvda-0.0.1-r366.ebuild
index bfb9516..0e4c24cb 100644
--- a/chromeos-base/libvda/libvda-0.0.1-r365.ebuild
+++ b/chromeos-base/libvda/libvda-0.0.1-r366.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "4b86eae6fc1a2faee58169d41c841c86ad9bc73c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "4b86eae6fc1a2faee58169d41c841c86ad9bc73c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/lorgnette/lorgnette-0.0.1-r3298.ebuild b/chromeos-base/lorgnette/lorgnette-0.0.1-r3299.ebuild
similarity index 91%
rename from chromeos-base/lorgnette/lorgnette-0.0.1-r3298.ebuild
rename to chromeos-base/lorgnette/lorgnette-0.0.1-r3299.ebuild
index 209e8b0..07b6d3f 100644
--- a/chromeos-base/lorgnette/lorgnette-0.0.1-r3298.ebuild
+++ b/chromeos-base/lorgnette/lorgnette-0.0.1-r3299.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2ebd98a342da634118dbe0c2147061dadbacd722" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2ebd98a342da634118dbe0c2147061dadbacd722" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r304.ebuild b/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r305.ebuild
similarity index 85%
rename from chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r304.ebuild
rename to chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r305.ebuild
index 992756c..0cd1e12 100644
--- a/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r304.ebuild
+++ b/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r305.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2ebd98a342da634118dbe0c2147061dadbacd722" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2ebd98a342da634118dbe0c2147061dadbacd722" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/lvmd-client/lvmd-client-0.0.1-r8.ebuild b/chromeos-base/lvmd-client/lvmd-client-0.0.1-r9.ebuild
similarity index 87%
rename from chromeos-base/lvmd-client/lvmd-client-0.0.1-r8.ebuild
rename to chromeos-base/lvmd-client/lvmd-client-0.0.1-r9.ebuild
index d0dc4da..3757151 100644
--- a/chromeos-base/lvmd-client/lvmd-client-0.0.1-r8.ebuild
+++ b/chromeos-base/lvmd-client/lvmd-client-0.0.1-r9.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9ffb67d6430bde120f7e5435dca1870fbcf571e1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9e73e8a72352b1b1983427c5dcadad86102dae9f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9e73e8a72352b1b1983427c5dcadad86102dae9f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/lvmd/lvmd-0.0.1-r9.ebuild b/chromeos-base/lvmd/lvmd-0.0.1-r10.ebuild
similarity index 88%
rename from chromeos-base/lvmd/lvmd-0.0.1-r9.ebuild
rename to chromeos-base/lvmd/lvmd-0.0.1-r10.ebuild
index ba91c40..a6b620e 100644
--- a/chromeos-base/lvmd/lvmd-0.0.1-r9.ebuild
+++ b/chromeos-base/lvmd/lvmd-0.0.1-r10.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9ffb67d6430bde120f7e5435dca1870fbcf571e1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9e73e8a72352b1b1983427c5dcadad86102dae9f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9e73e8a72352b1b1983427c5dcadad86102dae9f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/manatee-client/manatee-client-0.0.1-r275.ebuild b/chromeos-base/manatee-client/manatee-client-0.0.1-r276.ebuild
similarity index 85%
rename from chromeos-base/manatee-client/manatee-client-0.0.1-r275.ebuild
rename to chromeos-base/manatee-client/manatee-client-0.0.1-r276.ebuild
index 1a3fa5d..92a12790 100644
--- a/chromeos-base/manatee-client/manatee-client-0.0.1-r275.ebuild
+++ b/chromeos-base/manatee-client/manatee-client-0.0.1-r276.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="48dafe0185e0519022cce18049bca60f30dd94f1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9c2074e601aedb8358ee3b7c367c62042409c577" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9c2074e601aedb8358ee3b7c367c62042409c577" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/mcastd/mcastd-0.0.1-r429.ebuild b/chromeos-base/mcastd/mcastd-0.0.1-r430.ebuild
similarity index 86%
rename from chromeos-base/mcastd/mcastd-0.0.1-r429.ebuild
rename to chromeos-base/mcastd/mcastd-0.0.1-r430.ebuild
index 2ef3b91..046204d 100644
--- a/chromeos-base/mcastd/mcastd-0.0.1-r429.ebuild
+++ b/chromeos-base/mcastd/mcastd-0.0.1-r430.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="17e452aac8b4e3722e66f903b7846c56311a69d9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/memd/memd-0.1.0-r218.ebuild b/chromeos-base/memd/memd-0.1.0-r219.ebuild
similarity index 89%
rename from chromeos-base/memd/memd-0.1.0-r218.ebuild
rename to chromeos-base/memd/memd-0.1.0-r219.ebuild
index 6baa0c5..19debfb 100644
--- a/chromeos-base/memd/memd-0.1.0-r218.ebuild
+++ b/chromeos-base/memd/memd-0.1.0-r219.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("01b50a59e273ec24dbcb97c99f0613495bec8cd2" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("01b50a59e273ec24dbcb97c99f0613495bec8cd2" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_RUST_SUBDIR="metrics/memd"
 
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/mems_setup/mems_setup-0.0.1-r540.ebuild b/chromeos-base/mems_setup/mems_setup-0.0.1-r541.ebuild
similarity index 92%
rename from chromeos-base/mems_setup/mems_setup-0.0.1-r540.ebuild
rename to chromeos-base/mems_setup/mems_setup-0.0.1-r541.ebuild
index 9af83c6..7780c71 100644
--- a/chromeos-base/mems_setup/mems_setup-0.0.1-r540.ebuild
+++ b/chromeos-base/mems_setup/mems_setup-0.0.1-r541.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bfd9042ec7fdd477ffa54e02ec0d6358aff22060"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "59907d1e2a26ebb55ffe31e1bb4154906a2a8b80" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "59907d1e2a26ebb55ffe31e1bb4154906a2a8b80" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/metrics/metrics-0.0.1-r3465.ebuild b/chromeos-base/metrics/metrics-0.0.1-r3466.ebuild
similarity index 96%
rename from chromeos-base/metrics/metrics-0.0.1-r3465.ebuild
rename to chromeos-base/metrics/metrics-0.0.1-r3466.ebuild
index e90137c..01775e6 100644
--- a/chromeos-base/metrics/metrics-0.0.1-r3465.ebuild
+++ b/chromeos-base/metrics/metrics-0.0.1-r3466.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9bbe3d4f06a612d74b364226851f121bd539e8c5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/midis/midis-0.0.1-r1287.ebuild b/chromeos-base/midis/midis-0.0.1-r1288.ebuild
similarity index 90%
rename from chromeos-base/midis/midis-0.0.1-r1287.ebuild
rename to chromeos-base/midis/midis-0.0.1-r1288.ebuild
index b8636e4..2d8a2e5 100644
--- a/chromeos-base/midis/midis-0.0.1-r1287.ebuild
+++ b/chromeos-base/midis/midis-0.0.1-r1288.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "77cc36d72b2a07ce056c6dc57290b2e094db7931")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "31231d9b91954e1332b0c70e98f518eed9f27186" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4baf7cba90f916c94dd07c5746355f65e2ee0d8e")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "77cc36d72b2a07ce056c6dc57290b2e094db7931")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "31231d9b91954e1332b0c70e98f518eed9f27186" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4baf7cba90f916c94dd07c5746355f65e2ee0d8e")
 CROS_WORKON_LOCALNAME=(
 	"platform2"
 	"chromium/src/media/midi"

diff --git a/chromeos-base/minios/minios-0.0.1-r292.ebuild b/chromeos-base/minios/minios-0.0.1-r293.ebuild
similarity index 93%
rename from chromeos-base/minios/minios-0.0.1-r292.ebuild
rename to chromeos-base/minios/minios-0.0.1-r293.ebuild
index 6f086a4..bdf013b 100644
--- a/chromeos-base/minios/minios-0.0.1-r292.ebuild
+++ b/chromeos-base/minios/minios-0.0.1-r293.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "267f4c31778cc992ff3cbbff6a8147c24cad8a2c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "267f4c31778cc992ff3cbbff6a8147c24cad8a2c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/missive/missive-0.0.1-r297.ebuild b/chromeos-base/missive/missive-0.0.1-r298.ebuild
similarity index 95%
rename from chromeos-base/missive/missive-0.0.1-r297.ebuild
rename to chromeos-base/missive/missive-0.0.1-r298.ebuild
index 24da343..160bb0f 100644
--- a/chromeos-base/missive/missive-0.0.1-r297.ebuild
+++ b/chromeos-base/missive/missive-0.0.1-r298.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="6f23fb53410f42da68d79e5f0b18fbe84e774e74"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "193c9f869b11ef9acebdda75fc70f0f0e79c54ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "193c9f869b11ef9acebdda75fc70f0f0e79c54ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/mist/mist-0.0.1-r3301.ebuild b/chromeos-base/mist/mist-0.0.1-r3302.ebuild
similarity index 89%
rename from chromeos-base/mist/mist-0.0.1-r3301.ebuild
rename to chromeos-base/mist/mist-0.0.1-r3302.ebuild
index 76d20068b..fd004d0 100644
--- a/chromeos-base/mist/mist-0.0.1-r3301.ebuild
+++ b/chromeos-base/mist/mist-0.0.1-r3302.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "4ec2fa4d5c39ef8f7ff31b3d41e38249461e55f7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "4ec2fa4d5c39ef8f7ff31b3d41e38249461e55f7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1

diff --git a/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r216.ebuild b/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r217.ebuild
similarity index 86%
rename from chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r216.ebuild
rename to chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r217.ebuild
index f9f087d..d23298e 100644
--- a/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r216.ebuild
+++ b/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r217.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="4f1f289393fe616be5c0396171f06aee08e24cd5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/ml-client/ml-client-0.0.1-r198.ebuild b/chromeos-base/ml-client/ml-client-0.0.1-r199.ebuild
similarity index 85%
rename from chromeos-base/ml-client/ml-client-0.0.1-r198.ebuild
rename to chromeos-base/ml-client/ml-client-0.0.1-r199.ebuild
index 4409343..35eeced 100644
--- a/chromeos-base/ml-client/ml-client-0.0.1-r198.ebuild
+++ b/chromeos-base/ml-client/ml-client-0.0.1-r199.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "efb8748309392ad76f174d36f109b9866bcf8241" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "efb8748309392ad76f174d36f109b9866bcf8241" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r442.ebuild b/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r443.ebuild
similarity index 87%
rename from chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r442.ebuild
rename to chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r443.ebuild
index 493fa80..85d1484 100644
--- a/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r442.ebuild
+++ b/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r443.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="4f1f289393fe616be5c0396171f06aee08e24cd5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "efb8748309392ad76f174d36f109b9866bcf8241" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "efb8748309392ad76f174d36f109b9866bcf8241" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/chromeos-base/ml/ml-0.0.1-r762.ebuild b/chromeos-base/ml/ml-0.0.1-r763.ebuild
similarity index 97%
rename from chromeos-base/ml/ml-0.0.1-r762.ebuild
rename to chromeos-base/ml/ml-0.0.1-r763.ebuild
index f54a661..eda23ac 100644
--- a/chromeos-base/ml/ml-0.0.1-r762.ebuild
+++ b/chromeos-base/ml/ml-0.0.1-r763.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="4f1f289393fe616be5c0396171f06aee08e24cd5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "efb8748309392ad76f174d36f109b9866bcf8241" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "efb8748309392ad76f174d36f109b9866bcf8241" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 # TODO(amoylan): Set CROS_WORKON_OUTOFTREE_BUILD=1 after crbug.com/833675.

diff --git a/chromeos-base/modem-utilities/modem-utilities-0.0.1-r2936.ebuild b/chromeos-base/modem-utilities/modem-utilities-0.0.1-r2937.ebuild
similarity index 86%
rename from chromeos-base/modem-utilities/modem-utilities-0.0.1-r2936.ebuild
rename to chromeos-base/modem-utilities/modem-utilities-0.0.1-r2937.ebuild
index 428604a..aca616b 100644
--- a/chromeos-base/modem-utilities/modem-utilities-0.0.1-r2936.ebuild
+++ b/chromeos-base/modem-utilities/modem-utilities-0.0.1-r2937.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e2b936a0514f5beabb11c1b2b5bbe45470430604" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e2b936a0514f5beabb11c1b2b5bbe45470430604" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"

diff --git a/chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r147.ebuild b/chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r148.ebuild
similarity index 87%
rename from chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r147.ebuild
rename to chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r148.ebuild
index 5aaf47e..ace9c8d 100644
--- a/chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r147.ebuild
+++ b/chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r148.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="7532a0768fb92a1857fc584c1da89f447d725b23"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/modemfwd/..."
 )

diff --git a/chromeos-base/modemfwd/modemfwd-0.0.1-r1120.ebuild b/chromeos-base/modemfwd/modemfwd-0.0.1-r1121.ebuild
similarity index 91%
rename from chromeos-base/modemfwd/modemfwd-0.0.1-r1120.ebuild
rename to chromeos-base/modemfwd/modemfwd-0.0.1-r1121.ebuild
index e2af6b14..2084338 100644
--- a/chromeos-base/modemfwd/modemfwd-0.0.1-r1120.ebuild
+++ b/chromeos-base/modemfwd/modemfwd-0.0.1-r1121.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="7532a0768fb92a1857fc584c1da89f447d725b23"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r80.ebuild b/chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r81.ebuild
similarity index 87%
rename from chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r80.ebuild
rename to chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r81.ebuild
index 523bb6b..f12da2e 100644
--- a/chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r80.ebuild
+++ b/chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r81.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="24f2d51b0daf92d26ed05f31cb7a4e07a71548d0"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e5479e7b2bbc0ce8164e799c7f1bc50ec3216a48" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e5479e7b2bbc0ce8164e799c7f1bc50ec3216a48" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r594.ebuild b/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r595.ebuild
similarity index 86%
rename from chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r594.ebuild
rename to chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r595.ebuild
index 8a1be01..e4a888c 100644
--- a/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r594.ebuild
+++ b/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r595.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f783dc02e17f522e5e62cbc3a6f56aa96082b0c2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f783dc02e17f522e5e62cbc3a6f56aa96082b0c2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/mri_package/mri_package-0.0.1-r421.ebuild b/chromeos-base/mri_package/mri_package-0.0.1-r422.ebuild
similarity index 91%
rename from chromeos-base/mri_package/mri_package-0.0.1-r421.ebuild
rename to chromeos-base/mri_package/mri_package-0.0.1-r422.ebuild
index 9f06342..c475d16 100644
--- a/chromeos-base/mri_package/mri_package-0.0.1-r421.ebuild
+++ b/chromeos-base/mri_package/mri_package-0.0.1-r422.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="fa87804f91804b6c35ca82b83d45230b377c2d17"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "55e711ea347453c157ecfbeaa434f6236e83a8f6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "55e711ea347453c157ecfbeaa434f6236e83a8f6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_SUBTREE="common-mk media_perception .gn"

diff --git a/chromeos-base/mtpd/mtpd-0.0.1-r1055.ebuild b/chromeos-base/mtpd/mtpd-0.0.1-r1056.ebuild
similarity index 91%
rename from chromeos-base/mtpd/mtpd-0.0.1-r1055.ebuild
rename to chromeos-base/mtpd/mtpd-0.0.1-r1056.ebuild
index f7d51be..adc40c7 100644
--- a/chromeos-base/mtpd/mtpd-0.0.1-r1055.ebuild
+++ b/chromeos-base/mtpd/mtpd-0.0.1-r1056.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "19fd4b7d746a3e6652d8d74ce0ca72cba5b79156" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "19fd4b7d746a3e6652d8d74ce0ca72cba5b79156" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/ndproxyd/ndproxyd-0.0.1-r429.ebuild b/chromeos-base/ndproxyd/ndproxyd-0.0.1-r430.ebuild
similarity index 86%
rename from chromeos-base/ndproxyd/ndproxyd-0.0.1-r429.ebuild
rename to chromeos-base/ndproxyd/ndproxyd-0.0.1-r430.ebuild
index ccc23b7..22903d6 100644
--- a/chromeos-base/ndproxyd/ndproxyd-0.0.1-r429.ebuild
+++ b/chromeos-base/ndproxyd/ndproxyd-0.0.1-r430.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="17e452aac8b4e3722e66f903b7846c56311a69d9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/ocr/ocr-0.0.1-r183.ebuild b/chromeos-base/ocr/ocr-0.0.1-r184.ebuild
similarity index 92%
rename from chromeos-base/ocr/ocr-0.0.1-r183.ebuild
rename to chromeos-base/ocr/ocr-0.0.1-r184.ebuild
index d8cb0ad..0cbb2c7 100644
--- a/chromeos-base/ocr/ocr-0.0.1-r183.ebuild
+++ b/chromeos-base/ocr/ocr-0.0.1-r184.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "71ac4fba03d3ae469f2a9b2474be4fe0eee115f4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "71ac4fba03d3ae469f2a9b2474be4fe0eee115f4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/oobe_config/oobe_config-0.0.1-r673.ebuild b/chromeos-base/oobe_config/oobe_config-0.0.1-r674.ebuild
similarity index 94%
rename from chromeos-base/oobe_config/oobe_config-0.0.1-r673.ebuild
rename to chromeos-base/oobe_config/oobe_config-0.0.1-r674.ebuild
index da12c60..efcda38 100644
--- a/chromeos-base/oobe_config/oobe_config-0.0.1-r673.ebuild
+++ b/chromeos-base/oobe_config/oobe_config-0.0.1-r674.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "23e26d72db170ceb92e4d3682dbad1c73030acfa" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "23e26d72db170ceb92e4d3682dbad1c73030acfa" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/p2p/p2p-0.0.1-r3516.ebuild b/chromeos-base/p2p/p2p-0.0.1-r3517.ebuild
similarity index 92%
rename from chromeos-base/p2p/p2p-0.0.1-r3516.ebuild
rename to chromeos-base/p2p/p2p-0.0.1-r3517.ebuild
index f9694d3..83eff73 100644
--- a/chromeos-base/p2p/p2p-0.0.1-r3516.ebuild
+++ b/chromeos-base/p2p/p2p-0.0.1-r3517.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "d8f47448cc0c72d3398c8e958cf3ce08eba6f1d5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "d8f47448cc0c72d3398c8e958cf3ce08eba6f1d5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1

diff --git a/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r345.ebuild b/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r346.ebuild
similarity index 93%
rename from chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r345.ebuild
rename to chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r346.ebuild
index db43c2b..c2b77c9 100644
--- a/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r345.ebuild
+++ b/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r346.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="17e452aac8b4e3722e66f903b7846c56311a69d9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/patchpanel/patchpanel-0.0.2-r561.ebuild b/chromeos-base/patchpanel/patchpanel-0.0.2-r562.ebuild
similarity index 95%
rename from chromeos-base/patchpanel/patchpanel-0.0.2-r561.ebuild
rename to chromeos-base/patchpanel/patchpanel-0.0.2-r562.ebuild
index f210e4b..e0e97e7 100644
--- a/chromeos-base/patchpanel/patchpanel-0.0.2-r561.ebuild
+++ b/chromeos-base/patchpanel/patchpanel-0.0.2-r562.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="17e452aac8b4e3722e66f903b7846c56311a69d9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "bf11ffe5bade82cef5574e57f94fd0e7e38b716c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "bf11ffe5bade82cef5574e57f94fd0e7e38b716c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/pciguard/pciguard-0.0.1-r168.ebuild b/chromeos-base/pciguard/pciguard-0.0.1-r169.ebuild
similarity index 90%
rename from chromeos-base/pciguard/pciguard-0.0.1-r168.ebuild
rename to chromeos-base/pciguard/pciguard-0.0.1-r169.ebuild
index 7fb18e9..d5c9982 100644
--- a/chromeos-base/pciguard/pciguard-0.0.1-r168.ebuild
+++ b/chromeos-base/pciguard/pciguard-0.0.1-r169.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "ab158a900aa41e259ccbdbc58b75bfc3ae136f3b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "ab158a900aa41e259ccbdbc58b75bfc3ae136f3b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r135.ebuild b/chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r136.ebuild
similarity index 86%
rename from chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r135.ebuild
rename to chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r136.ebuild
index 2fb8270..607516c 100644
--- a/chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r135.ebuild
+++ b/chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r136.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "1288ac713c854ca0f3e6c2cd1c77e98a5a194e74" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "1288ac713c854ca0f3e6c2cd1c77e98a5a194e74" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2023.ebuild b/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2024.ebuild
similarity index 89%
rename from chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2023.ebuild
rename to chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2024.ebuild
index 05de67b..01b63b4 100644
--- a/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2023.ebuild
+++ b/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2024.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/permission_broker/permission_broker-0.0.1-r3277.ebuild b/chromeos-base/permission_broker/permission_broker-0.0.1-r3278.ebuild
similarity index 92%
rename from chromeos-base/permission_broker/permission_broker-0.0.1-r3277.ebuild
rename to chromeos-base/permission_broker/permission_broker-0.0.1-r3278.ebuild
index 9604c91..6d7dd80 100644
--- a/chromeos-base/permission_broker/permission_broker-0.0.1-r3277.ebuild
+++ b/chromeos-base/permission_broker/permission_broker-0.0.1-r3278.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/pinweaver/pinweaver-0.0.1-r86.ebuild b/chromeos-base/pinweaver/pinweaver-0.0.1-r87.ebuild
similarity index 90%
rename from chromeos-base/pinweaver/pinweaver-0.0.1-r86.ebuild
rename to chromeos-base/pinweaver/pinweaver-0.0.1-r87.ebuild
index 5361ca6..ef4f4d0 100644
--- a/chromeos-base/pinweaver/pinweaver-0.0.1-r86.ebuild
+++ b/chromeos-base/pinweaver/pinweaver-0.0.1-r87.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("6f23fb53410f42da68d79e5f0b18fbe84e774e74" "3abfd77090d24ca8d2d7260d6ba6aaec2e4c35ae")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "86f25a69ccb900fd0f5da1a8861df68696c36330")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "3abfd77090d24ca8d2d7260d6ba6aaec2e4c35ae")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "86f25a69ccb900fd0f5da1a8861df68696c36330")
 inherit cros-constants
 
 CROS_WORKON_LOCALNAME=(

diff --git a/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r324.ebuild b/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r325.ebuild
similarity index 87%
rename from chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r324.ebuild
rename to chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r325.ebuild
index 7fbc9de..1e2c0bb 100644
--- a/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r324.ebuild
+++ b/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r325.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f6e985347a838bbbdd2997e97c4b4940571f2dd2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f6e985347a838bbbdd2997e97c4b4940571f2dd2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/policy/..."
 )

diff --git a/chromeos-base/policy_utils/policy_utils-0.0.1-r327.ebuild b/chromeos-base/policy_utils/policy_utils-0.0.1-r328.ebuild
similarity index 88%
rename from chromeos-base/policy_utils/policy_utils-0.0.1-r327.ebuild
rename to chromeos-base/policy_utils/policy_utils-0.0.1-r328.ebuild
index d183810..82a4189 100644
--- a/chromeos-base/policy_utils/policy_utils-0.0.1-r327.ebuild
+++ b/chromeos-base/policy_utils/policy_utils-0.0.1-r328.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="d4ba4012801736cf74fad1e79949e7f776bd0e98"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "8fbdaea8ad40677acc8a26ad43f036ed7ece2ec8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "8fbdaea8ad40677acc8a26ad43f036ed7ece2ec8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2416.ebuild b/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2417.ebuild
similarity index 87%
rename from chromeos-base/power_manager-client/power_manager-client-0.0.1-r2416.ebuild
rename to chromeos-base/power_manager-client/power_manager-client-0.0.1-r2417.ebuild
index 3469781..e1c2ef3 100644
--- a/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2416.ebuild
+++ b/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2417.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b78108f7b2a06e320400e3809d4ecc36f846d8f3"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "0bb1188da737e1a0399457e852e32dc8cfba2567" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "0bb1188da737e1a0399457e852e32dc8cfba2567" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/power_manager/power_manager-0.0.2-r4325.ebuild b/chromeos-base/power_manager/power_manager-0.0.2-r4326.ebuild
similarity index 97%
rename from chromeos-base/power_manager/power_manager-0.0.2-r4325.ebuild
rename to chromeos-base/power_manager/power_manager-0.0.2-r4326.ebuild
index 3fb6b63..471f395 100644
--- a/chromeos-base/power_manager/power_manager-0.0.2-r4325.ebuild
+++ b/chromeos-base/power_manager/power_manager-0.0.2-r4326.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="33c269d6685f571cacfe64880b0f19beb11437e9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0bb1188da737e1a0399457e852e32dc8cfba2567" "62f84a7b4216d539df553a5bafe00d85969a9f63" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0bb1188da737e1a0399457e852e32dc8cfba2567" "62f84a7b4216d539df553a5bafe00d85969a9f63" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/print_tools/print_tools-0.0.1-r257.ebuild b/chromeos-base/print_tools/print_tools-0.0.1-r258.ebuild
similarity index 86%
rename from chromeos-base/print_tools/print_tools-0.0.1-r257.ebuild
rename to chromeos-base/print_tools/print_tools-0.0.1-r258.ebuild
index 05df8fc..cc1c6da 100644
--- a/chromeos-base/print_tools/print_tools-0.0.1-r257.ebuild
+++ b/chromeos-base/print_tools/print_tools-0.0.1-r258.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9d7d743de5a33db75bfc76a90099e2bd61797cc7"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "13183fe914ad9f617d493ad25fe9b7db7b0078ab" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "13183fe914ad9f617d493ad25fe9b7db7b0078ab" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r13.ebuild b/chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r14.ebuild
similarity index 86%
rename from chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r13.ebuild
rename to chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r14.ebuild
index 6578d12..de483c0 100644
--- a/chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r13.ebuild
+++ b/chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r14.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="7532a0768fb92a1857fc584c1da89f447d725b23"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/quipper/quipper-0.0.1-r2790.ebuild b/chromeos-base/quipper/quipper-0.0.1-r2791.ebuild
similarity index 93%
rename from chromeos-base/quipper/quipper-0.0.1-r2790.ebuild
rename to chromeos-base/quipper/quipper-0.0.1-r2791.ebuild
index d7f625f..c8966b6 100644
--- a/chromeos-base/quipper/quipper-0.0.1-r2790.ebuild
+++ b/chromeos-base/quipper/quipper-0.0.1-r2791.ebuild

@@ -4,8 +4,8 @@
 # Don't use Makefile.external here as it fetches from the network.
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/rendernodehost/rendernodehost-0.0.1-r297.ebuild b/chromeos-base/rendernodehost/rendernodehost-0.0.1-r298.ebuild
similarity index 85%
rename from chromeos-base/rendernodehost/rendernodehost-0.0.1-r297.ebuild
rename to chromeos-base/rendernodehost/rendernodehost-0.0.1-r298.ebuild
index 2969253..ccfbd2b 100644
--- a/chromeos-base/rendernodehost/rendernodehost-0.0.1-r297.ebuild
+++ b/chromeos-base/rendernodehost/rendernodehost-0.0.1-r298.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/rgbkbd/rgbkbd-0.0.1-r124.ebuild b/chromeos-base/rgbkbd/rgbkbd-0.0.1-r125.ebuild
similarity index 91%
rename from chromeos-base/rgbkbd/rgbkbd-0.0.1-r124.ebuild
rename to chromeos-base/rgbkbd/rgbkbd-0.0.1-r125.ebuild
index 1984149..e7f38df 100644
--- a/chromeos-base/rgbkbd/rgbkbd-0.0.1-r124.ebuild
+++ b/chromeos-base/rgbkbd/rgbkbd-0.0.1-r125.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="33c269d6685f571cacfe64880b0f19beb11437e9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "58bdeaa3004ba5dc3bf524c1d0a3d444f4984d28" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "58bdeaa3004ba5dc3bf524c1d0a3d444f4984d28" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/rmad/rmad-0.0.1-r489.ebuild b/chromeos-base/rmad/rmad-0.0.1-r490.ebuild
similarity index 92%
rename from chromeos-base/rmad/rmad-0.0.1-r489.ebuild
rename to chromeos-base/rmad/rmad-0.0.1-r490.ebuild
index c4de5fb..ed7c93c 100644
--- a/chromeos-base/rmad/rmad-0.0.1-r489.ebuild
+++ b/chromeos-base/rmad/rmad-0.0.1-r490.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bfd9042ec7fdd477ffa54e02ec0d6358aff22060"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "68361c6922909c829d679a3b5f79a5a64e977c35" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "bdcd86d7f8af0e0cfd82183af63cd1006e593a1a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "68361c6922909c829d679a3b5f79a5a64e977c35" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "bdcd86d7f8af0e0cfd82183af63cd1006e593a1a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/run_oci/run_oci-0.0.1-r1240.ebuild b/chromeos-base/run_oci/run_oci-0.0.1-r1241.ebuild
similarity index 89%
rename from chromeos-base/run_oci/run_oci-0.0.1-r1240.ebuild
rename to chromeos-base/run_oci/run_oci-0.0.1-r1241.ebuild
index 5ccd41d..939a676 100644
--- a/chromeos-base/run_oci/run_oci-0.0.1-r1240.ebuild
+++ b/chromeos-base/run_oci/run_oci-0.0.1-r1241.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="ceb8ea7db1fd927e179511df231750744644ccd2"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "a6cf87161b285bcef270a8d37f2240ab6eb2952e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "a6cf87161b285bcef270a8d37f2240ab6eb2952e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r17.ebuild b/chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r18.ebuild
similarity index 87%
rename from chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r17.ebuild
rename to chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r18.ebuild
index 704bc40..e5fe707 100644
--- a/chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r17.ebuild
+++ b/chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r18.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/runtime_probe/runtime_probe-0.0.1-r864.ebuild b/chromeos-base/runtime_probe/runtime_probe-0.0.1-r865.ebuild
similarity index 92%
rename from chromeos-base/runtime_probe/runtime_probe-0.0.1-r864.ebuild
rename to chromeos-base/runtime_probe/runtime_probe-0.0.1-r865.ebuild
index e7b3bdb..55ad9cb 100644
--- a/chromeos-base/runtime_probe/runtime_probe-0.0.1-r864.ebuild
+++ b/chromeos-base/runtime_probe/runtime_probe-0.0.1-r865.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="33c269d6685f571cacfe64880b0f19beb11437e9"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r251.ebuild b/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r252.ebuild
similarity index 90%
rename from chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r251.ebuild
rename to chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r252.ebuild
index 2c1a34e..492f619 100644
--- a/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r251.ebuild
+++ b/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r252.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "b996d22037bb49a510f4dbf3139a179f8727ed59" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "b996d22037bb49a510f4dbf3139a179f8727ed59" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_SUBTREE="common-mk screen-capture-utils .gn"

diff --git a/chromeos-base/sealed_storage/sealed_storage-0.0.1-r588.ebuild b/chromeos-base/sealed_storage/sealed_storage-0.0.1-r589.ebuild
similarity index 89%
rename from chromeos-base/sealed_storage/sealed_storage-0.0.1-r588.ebuild
rename to chromeos-base/sealed_storage/sealed_storage-0.0.1-r589.ebuild
index 5bf985b..7045035 100644
--- a/chromeos-base/sealed_storage/sealed_storage-0.0.1-r588.ebuild
+++ b/chromeos-base/sealed_storage/sealed_storage-0.0.1-r589.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "ebd80d3e9a0d5136bc9154864fc7c23cea4a5861" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "ebd80d3e9a0d5136bc9154864fc7c23cea4a5861" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/secanomalyd/secanomalyd-0.0.1-r259.ebuild b/chromeos-base/secanomalyd/secanomalyd-0.0.1-r260.ebuild
similarity index 90%
rename from chromeos-base/secanomalyd/secanomalyd-0.0.1-r259.ebuild
rename to chromeos-base/secanomalyd/secanomalyd-0.0.1-r260.ebuild
index 706b97d..cdcd5a8 100644
--- a/chromeos-base/secanomalyd/secanomalyd-0.0.1-r259.ebuild
+++ b/chromeos-base/secanomalyd/secanomalyd-0.0.1-r260.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "49734b00bc3c6d6877429cc25d1d504275e3a151" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "49734b00bc3c6d6877429cc25d1d504275e3a151" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1042.ebuild b/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1043.ebuild
similarity index 84%
rename from chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1042.ebuild
rename to chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1043.ebuild
index 4cd2dac..2de72c8 100644
--- a/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1042.ebuild
+++ b/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1043.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/secure-wipe/secure-wipe-0.0.1-r261.ebuild b/chromeos-base/secure-wipe/secure-wipe-0.0.1-r262.ebuild
similarity index 87%
rename from chromeos-base/secure-wipe/secure-wipe-0.0.1-r261.ebuild
rename to chromeos-base/secure-wipe/secure-wipe-0.0.1-r262.ebuild
index 86e1c18..de50f5a 100644
--- a/chromeos-base/secure-wipe/secure-wipe-0.0.1-r261.ebuild
+++ b/chromeos-base/secure-wipe/secure-wipe-0.0.1-r262.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "898687cfd878621b0aa42a27138c8a6c72210b16" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "898687cfd878621b0aa42a27138c8a6c72210b16" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD="1"

diff --git a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2355.ebuild b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2356.ebuild
similarity index 89%
rename from chromeos-base/session_manager-client/session_manager-client-0.0.1-r2355.ebuild
rename to chromeos-base/session_manager-client/session_manager-client-0.0.1-r2356.ebuild
index d7c278b..d1de6ef 100644
--- a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2355.ebuild
+++ b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2356.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="223dc079ee4398a1ed98550a68f51618cef0f60b"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "86c7faad3e91503ff0fd5d28ede2e13016668322" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "86c7faad3e91503ff0fd5d28ede2e13016668322" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/shill-client/shill-client-0.0.1-r3200.ebuild b/chromeos-base/shill-client/shill-client-0.0.1-r3201.ebuild
similarity index 87%
rename from chromeos-base/shill-client/shill-client-0.0.1-r3200.ebuild
rename to chromeos-base/shill-client/shill-client-0.0.1-r3201.ebuild
index de3c043..1c8b076 100644
--- a/chromeos-base/shill-client/shill-client-0.0.1-r3200.ebuild
+++ b/chromeos-base/shill-client/shill-client-0.0.1-r3201.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="2c3cb1b971b2727514b673e9a2a8ca7525467f5c"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r972.ebuild b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r973.ebuild
similarity index 90%
rename from chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r972.ebuild
rename to chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r973.ebuild
index 4922736..701a739 100644
--- a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r972.ebuild
+++ b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r973.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="2c3cb1b971b2727514b673e9a2a8ca7525467f5c"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/shill-net/shill-net-0.0.1-r1048.ebuild b/chromeos-base/shill-net/shill-net-0.0.1-r1049.ebuild
similarity index 93%
rename from chromeos-base/shill-net/shill-net-0.0.1-r1048.ebuild
rename to chromeos-base/shill-net/shill-net-0.0.1-r1049.ebuild
index 5a98ccd..52ae042 100644
--- a/chromeos-base/shill-net/shill-net-0.0.1-r1048.ebuild
+++ b/chromeos-base/shill-net/shill-net-0.0.1-r1049.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="2c3cb1b971b2727514b673e9a2a8ca7525467f5c"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/shill/shill-0.0.5-r3422.ebuild b/chromeos-base/shill/shill-0.0.5-r3423.ebuild
similarity index 97%
rename from chromeos-base/shill/shill-0.0.5-r3422.ebuild
rename to chromeos-base/shill/shill-0.0.5-r3423.ebuild
index 019640cd..002bc2e 100644
--- a/chromeos-base/shill/shill-0.0.5-r3422.ebuild
+++ b/chromeos-base/shill/shill-0.0.5-r3423.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="2c3cb1b971b2727514b673e9a2a8ca7525467f5c"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "462cb7ad367bdc196dd234e5bae863472f6d704b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "462cb7ad367bdc196dd234e5bae863472f6d704b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/smbfs/smbfs-0.0.1-r343.ebuild b/chromeos-base/smbfs/smbfs-0.0.1-r344.ebuild
similarity index 92%
rename from chromeos-base/smbfs/smbfs-0.0.1-r343.ebuild
rename to chromeos-base/smbfs/smbfs-0.0.1-r344.ebuild
index ff3245f..b5a98be 100644
--- a/chromeos-base/smbfs/smbfs-0.0.1-r343.ebuild
+++ b/chromeos-base/smbfs/smbfs-0.0.1-r344.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "081f3cb6a8b89d84bcb58dd2f4af48252bc9af8b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "081f3cb6a8b89d84bcb58dd2f4af48252bc9af8b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/smbprovider/smbprovider-0.0.1-r847.ebuild b/chromeos-base/smbprovider/smbprovider-0.0.1-r848.ebuild
similarity index 92%
rename from chromeos-base/smbprovider/smbprovider-0.0.1-r847.ebuild
rename to chromeos-base/smbprovider/smbprovider-0.0.1-r848.ebuild
index afcd6a3..a9182a6 100644
--- a/chromeos-base/smbprovider/smbprovider-0.0.1-r847.ebuild
+++ b/chromeos-base/smbprovider/smbprovider-0.0.1-r848.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "2e66ddb9236626115d901c320e96774023921bb0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "2e66ddb9236626115d901c320e96774023921bb0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/smogcheck/smogcheck-0.0.1-r3177.ebuild b/chromeos-base/smogcheck/smogcheck-0.0.1-r3178.ebuild
similarity index 86%
rename from chromeos-base/smogcheck/smogcheck-0.0.1-r3177.ebuild
rename to chromeos-base/smogcheck/smogcheck-0.0.1-r3178.ebuild
index a139ee2..9096511 100644
--- a/chromeos-base/smogcheck/smogcheck-0.0.1-r3177.ebuild
+++ b/chromeos-base/smogcheck/smogcheck-0.0.1-r3178.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "25b90cd13b01122d778a1d55d814c5b001b88d22" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "25b90cd13b01122d778a1d55d814c5b001b88d22" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE="common-mk smogcheck .gn"

diff --git a/chromeos-base/sommelier/sommelier-0.0.1-r313.ebuild b/chromeos-base/sommelier/sommelier-0.0.1-r314.ebuild
similarity index 94%
rename from chromeos-base/sommelier/sommelier-0.0.1-r313.ebuild
rename to chromeos-base/sommelier/sommelier-0.0.1-r314.ebuild
index 380653d..6f6024f 100644
--- a/chromeos-base/sommelier/sommelier-0.0.1-r313.ebuild
+++ b/chromeos-base/sommelier/sommelier-0.0.1-r314.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="96ed9400def6165760c4a9cbe0c1b02aff1d37f3"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f81fd2f617fbb538b0e48736020d89814f047321" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f81fd2f617fbb538b0e48736020d89814f047321" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/spaced/spaced-0.0.1-r132.ebuild b/chromeos-base/spaced/spaced-0.0.1-r133.ebuild
similarity index 90%
rename from chromeos-base/spaced/spaced-0.0.1-r132.ebuild
rename to chromeos-base/spaced/spaced-0.0.1-r133.ebuild
index afa4e79..57480ee 100644
--- a/chromeos-base/spaced/spaced-0.0.1-r132.ebuild
+++ b/chromeos-base/spaced/spaced-0.0.1-r133.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="12fcfd43261a1815ba13894f22bf223beee4bfc0"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "350cc434223a8fc7e7852f0b810bac3e4cb660ce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "350cc434223a8fc7e7852f0b810bac3e4cb660ce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/st_flash/st_flash-0.0.1-r1368.ebuild b/chromeos-base/st_flash/st_flash-0.0.1-r1369.ebuild
similarity index 83%
rename from chromeos-base/st_flash/st_flash-0.0.1-r1368.ebuild
rename to chromeos-base/st_flash/st_flash-0.0.1-r1369.ebuild
index b2a23de..2a0a023 100644
--- a/chromeos-base/st_flash/st_flash-0.0.1-r1368.ebuild
+++ b/chromeos-base/st_flash/st_flash-0.0.1-r1369.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "0f74874dbc6607278e98259190322851828be09a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "0f74874dbc6607278e98259190322851828be09a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/syslog-cat/syslog-cat-0.0.1-r163.ebuild b/chromeos-base/syslog-cat/syslog-cat-0.0.1-r164.ebuild
similarity index 85%
rename from chromeos-base/syslog-cat/syslog-cat-0.0.1-r163.ebuild
rename to chromeos-base/syslog-cat/syslog-cat-0.0.1-r164.ebuild
index ffd62f4..5c50dc4 100644
--- a/chromeos-base/syslog-cat/syslog-cat-0.0.1-r163.ebuild
+++ b/chromeos-base/syslog-cat/syslog-cat-0.0.1-r164.ebuild

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "14d6946889ebac09c54e1fba8bc1e1b13ab78411" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "14d6946889ebac09c54e1fba8bc1e1b13ab78411" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/system-proxy/system-proxy-0.0.1-r347.ebuild b/chromeos-base/system-proxy/system-proxy-0.0.1-r348.ebuild
similarity index 92%
rename from chromeos-base/system-proxy/system-proxy-0.0.1-r347.ebuild
rename to chromeos-base/system-proxy/system-proxy-0.0.1-r348.ebuild
index c28bd01..7fe3dab 100644
--- a/chromeos-base/system-proxy/system-proxy-0.0.1-r347.ebuild
+++ b/chromeos-base/system-proxy/system-proxy-0.0.1-r348.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "70b0fead532fb2583dfa6edeaabc09c1d55d2fc7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "70b0fead532fb2583dfa6edeaabc09c1d55d2fc7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/system_api/system_api-0.0.1-r4856.ebuild b/chromeos-base/system_api/system_api-0.0.1-r4857.ebuild
similarity index 95%
rename from chromeos-base/system_api/system_api-0.0.1-r4856.ebuild
rename to chromeos-base/system_api/system_api-0.0.1-r4857.ebuild
index d296753..9ee6a4b 100644
--- a/chromeos-base/system_api/system_api-0.0.1-r4856.ebuild
+++ b/chromeos-base/system_api/system_api-0.0.1-r4857.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bd1e9c1e5b99575aae4c3cbd6a2c102d567a7517"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "1341afbe61e8ddabb7a86b15e553b65d92db921d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "1341afbe61e8ddabb7a86b15e553b65d92db921d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/system_api/..."
 )

diff --git a/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r323.ebuild b/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r324.ebuild
similarity index 89%
rename from chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r323.ebuild
rename to chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r324.ebuild
index cda400a..97c0da0 100644
--- a/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r323.ebuild
+++ b/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r324.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "d8d406b588f5e14549e39cefcefb704cbfddbaeb")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "bf03aea0f861ec5a30ee63b5814057ceee176ad9")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "299221f994dd63416c14201f29ded16d5bf9ebb5")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "bf03aea0f861ec5a30ee63b5814057ceee176ad9")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/platform/tast-tests")
 CROS_WORKON_LOCALNAME=("platform2" "platform/tast-tests")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/tast-tests")

diff --git a/chromeos-base/timberslide/timberslide-0.0.1-r1751.ebuild b/chromeos-base/timberslide/timberslide-0.0.1-r1752.ebuild
similarity index 87%
rename from chromeos-base/timberslide/timberslide-0.0.1-r1751.ebuild
rename to chromeos-base/timberslide/timberslide-0.0.1-r1752.ebuild
index 18d80ad..bf0adbe 100644
--- a/chromeos-base/timberslide/timberslide-0.0.1-r1751.ebuild
+++ b/chromeos-base/timberslide/timberslide-0.0.1-r1752.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "03fa7b4f0634999ce6aec1391ba9d90f1b0395dc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "03fa7b4f0634999ce6aec1391ba9d90f1b0395dc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1007.ebuild b/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1008.ebuild
similarity index 90%
rename from chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1007.ebuild
rename to chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1008.ebuild
index b56aad8..214dbe5 100644
--- a/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1007.ebuild
+++ b/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1008.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "55f3832e43104006d40fb50872f058e8cd27f233" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "55f3832e43104006d40fb50872f058e8cd27f233" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1

diff --git a/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1950.ebuild b/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1951.ebuild
similarity index 90%
rename from chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1950.ebuild
rename to chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1951.ebuild
index 4fbc95e..e6f3cfd 100644
--- a/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1950.ebuild
+++ b/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1951.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "b2ae20cf5a237ca246eecb61de48d18247370fd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "b2ae20cf5a237ca246eecb61de48d18247370fd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r450.ebuild b/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r451.ebuild
similarity index 94%
rename from chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r450.ebuild
rename to chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r451.ebuild
index 875825e..4df517d 100644
--- a/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r450.ebuild
+++ b/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r451.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="98b3b14ce9691c4e0d1c3d0797a3f961a1dea314"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2613.ebuild b/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2614.ebuild
similarity index 95%
rename from chromeos-base/tpm_manager/tpm_manager-0.0.1-r2613.ebuild
rename to chromeos-base/tpm_manager/tpm_manager-0.0.1-r2614.ebuild
index 87333aa..883bf1e 100644
--- a/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2613.ebuild
+++ b/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2614.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "b90d0e8f789e8cfe86794cb3f36ae69967b7dc36" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "b90d0e8f789e8cfe86794cb3f36ae69967b7dc36" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r484.ebuild b/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r485.ebuild
similarity index 91%
rename from chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r484.ebuild
rename to chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r485.ebuild
index 5aba47e..91901e9 100644
--- a/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r484.ebuild
+++ b/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r485.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e92f2290c63a51a33949ed1a9610b7c26e83d813" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e92f2290c63a51a33949ed1a9610b7c26e83d813" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/trunks/trunks-0.0.1-r3289.ebuild b/chromeos-base/trunks/trunks-0.0.1-r3290.ebuild
similarity index 97%
rename from chromeos-base/trunks/trunks-0.0.1-r3289.ebuild
rename to chromeos-base/trunks/trunks-0.0.1-r3290.ebuild
index 4d07400..c9d2183 100644
--- a/chromeos-base/trunks/trunks-0.0.1-r3289.ebuild
+++ b/chromeos-base/trunks/trunks-0.0.1-r3290.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/typecd/typecd-0.0.1-r356.ebuild b/chromeos-base/typecd/typecd-0.0.1-r357.ebuild
similarity index 94%
rename from chromeos-base/typecd/typecd-0.0.1-r356.ebuild
rename to chromeos-base/typecd/typecd-0.0.1-r357.ebuild
index dc0fe7b..6f23e4b 100644
--- a/chromeos-base/typecd/typecd-0.0.1-r356.ebuild
+++ b/chromeos-base/typecd/typecd-0.0.1-r357.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="79a6efeaac9dd69f1cd47a8bf0d6a4179c94a84d"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "fa7554557aaddd2c63ee2c755c84e72a366d4302" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "fa7554557aaddd2c63ee2c755c84e72a366d4302" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/u2fd-client/u2fd-client-0.0.1-r68.ebuild b/chromeos-base/u2fd-client/u2fd-client-0.0.1-r69.ebuild
similarity index 89%
rename from chromeos-base/u2fd-client/u2fd-client-0.0.1-r68.ebuild
rename to chromeos-base/u2fd-client/u2fd-client-0.0.1-r69.ebuild
index 0325fef..bb8d51f 100644
--- a/chromeos-base/u2fd-client/u2fd-client-0.0.1-r68.ebuild
+++ b/chromeos-base/u2fd-client/u2fd-client-0.0.1-r69.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "b5881b78580dbead29183a70fdc260387f29d82a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "b5881b78580dbead29183a70fdc260387f29d82a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/u2fd/u2fd-0.0.1-r1542.ebuild b/chromeos-base/u2fd/u2fd-0.0.1-r1543.ebuild
similarity index 95%
rename from chromeos-base/u2fd/u2fd-0.0.1-r1542.ebuild
rename to chromeos-base/u2fd/u2fd-0.0.1-r1543.ebuild
index fb46100..5560966 100644
--- a/chromeos-base/u2fd/u2fd-0.0.1-r1542.ebuild
+++ b/chromeos-base/u2fd/u2fd-0.0.1-r1543.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "b5881b78580dbead29183a70fdc260387f29d82a" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "b5881b78580dbead29183a70fdc260387f29d82a" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/update_engine-client/update_engine-client-0.0.1-r2083.ebuild b/chromeos-base/update_engine-client/update_engine-client-0.0.1-r2084.ebuild
similarity index 89%
rename from chromeos-base/update_engine-client/update_engine-client-0.0.1-r2083.ebuild
rename to chromeos-base/update_engine-client/update_engine-client-0.0.1-r2084.ebuild
index fcbac63..87594af 100644
--- a/chromeos-base/update_engine-client/update_engine-client-0.0.1-r2083.ebuild
+++ b/chromeos-base/update_engine-client/update_engine-client-0.0.1-r2084.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "b1ecaff8d71f1229a4cf9a311003e4bc3ded78cf")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "372f10e79ea2c24a73cc3a7dc6e2a620e1486ac5")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "b1ecaff8d71f1229a4cf9a311003e4bc3ded78cf")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "372f10e79ea2c24a73cc3a7dc6e2a620e1486ac5")
 CROS_WORKON_LOCALNAME=("platform2" "aosp/system/update_engine")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/system/update_engine")
 CROS_WORKON_EGIT_BRANCH=("main" "master")

diff --git a/chromeos-base/update_engine/update_engine-0.0.3-r4157.ebuild b/chromeos-base/update_engine/update_engine-0.0.3-r4158.ebuild
similarity index 96%
rename from chromeos-base/update_engine/update_engine-0.0.3-r4157.ebuild
rename to chromeos-base/update_engine/update_engine-0.0.3-r4158.ebuild
index aec5311..e0e947a 100644
--- a/chromeos-base/update_engine/update_engine-0.0.3-r4157.ebuild
+++ b/chromeos-base/update_engine/update_engine-0.0.3-r4158.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("52616c3ec16e7dd73a782baaf3d3c491ad10fa8f" "b1ecaff8d71f1229a4cf9a311003e4bc3ded78cf")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "9ca3931359eba7f30b4f9b57e401d2ed7eebdd0b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "372f10e79ea2c24a73cc3a7dc6e2a620e1486ac5")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "b1ecaff8d71f1229a4cf9a311003e4bc3ded78cf")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "9ca3931359eba7f30b4f9b57e401d2ed7eebdd0b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "372f10e79ea2c24a73cc3a7dc6e2a620e1486ac5")
 CROS_WORKON_LOCALNAME=("platform2" "aosp/system/update_engine")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/system/update_engine")
 CROS_WORKON_EGIT_BRANCH=("main" "master")

diff --git a/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r210.ebuild b/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r211.ebuild
similarity index 86%
rename from chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r210.ebuild
rename to chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r211.ebuild
index de40392..32d1e42 100644
--- a/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r210.ebuild
+++ b/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r211.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a3eac5d15a46a63784099b3fe4af44a89d376a6f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a3eac5d15a46a63784099b3fe4af44a89d376a6f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r555.ebuild b/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r556.ebuild
similarity index 93%
rename from chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r555.ebuild
rename to chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r556.ebuild
index fc8fb29..3208a6f 100644
--- a/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r555.ebuild
+++ b/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r556.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1a23f32c407371216dce72b8edba954e08ec6fdb"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "974e43385202b259caed149a94f511942d087201" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "974e43385202b259caed149a94f511942d087201" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1352.ebuild b/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1353.ebuild
similarity index 85%
rename from chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1352.ebuild
rename to chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1353.ebuild
index 64db006..0d96fc9 100644
--- a/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1352.ebuild
+++ b/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1353.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"

diff --git a/chromeos-base/verity/verity-0.0.1-r304.ebuild b/chromeos-base/verity/verity-0.0.1-r305.ebuild
similarity index 88%
rename from chromeos-base/verity/verity-0.0.1-r304.ebuild
rename to chromeos-base/verity/verity-0.0.1-r305.ebuild
index 7f8f410..d12a5f7 100644
--- a/chromeos-base/verity/verity-0.0.1-r304.ebuild
+++ b/chromeos-base/verity/verity-0.0.1-r305.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "a65107acb3c4cbbae51687d8409856f07b5dda27" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "a65107acb3c4cbbae51687d8409856f07b5dda27" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r945.ebuild b/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r946.ebuild
similarity index 91%
rename from chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r945.ebuild
rename to chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r946.ebuild
index 4c6d03d..a1e6a35 100644
--- a/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r945.ebuild
+++ b/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r946.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "fc293354fb8ad9a9192d7ebfab15a03e8f0799ba" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "fc293354fb8ad9a9192d7ebfab15a03e8f0799ba" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r425.ebuild b/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r426.ebuild
similarity index 94%
rename from chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r425.ebuild
rename to chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r426.ebuild
index eaf2234..02290c1 100644
--- a/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r425.ebuild
+++ b/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r426.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("2c3cb1b971b2727514b673e9a2a8ca7525467f5c" "768c633a4cdfd3ef1cb779e18997eac36152dd83")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a5bcfc0f633bf4f53ef09fcf2f8045ecbd51ab93")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "768c633a4cdfd3ef1cb779e18997eac36152dd83")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a5bcfc0f633bf4f53ef09fcf2f8045ecbd51ab93")
 CROS_WORKON_LOCALNAME=("platform2" "third_party/virtual-usb-printer")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/virtual-usb-printer")
 CROS_WORKON_EGIT_BRANCH=("main" "chromeos")

diff --git a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1373.ebuild b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1374.ebuild
similarity index 96%
rename from chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1373.ebuild
rename to chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1374.ebuild
index f295fd8..b3df879 100644
--- a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1373.ebuild
+++ b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1374.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0d28a8f73eaa50097ef422f570421d7ccb1e0419"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7ef75a42aba67052842459f221271e681184cc89" "8c8679f9db77b724d522f2d6a76d3bfdfeae827e" "78a28564de27e03edbd93427ebc24aede3905082" "5159f439e8516f904859190cfd0375b7a4d05db2" "7c108bfa432bb4ff83e68e2ea1f884213ef29868" "97190407ff6df6ae497a54e632369afdf09cd621" "12dbe2245d86e86471aa84fb7656d3f422e1d6b6" "49733aa1ca831c8f507f6c0eae190e74c4c188d3" "f81fd2f617fbb538b0e48736020d89814f047321" "8ead32c3d109ae63ef89e4aa3b818aeb38b51d14" "aeddba56bfc6b1475cd7c298400145765f327a2f" "889e63b35e958b34d6cf15f62b243d442f1bac83" "64eb467661fb048cf581eb28e5ee0423136b4a02" "81465f23987dd2c482006411430ef171e856c5fe" "a01dc69a1e1fa54805fe9b48ce5c278a7e70de0c")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7ef75a42aba67052842459f221271e681184cc89" "8c8679f9db77b724d522f2d6a76d3bfdfeae827e" "78a28564de27e03edbd93427ebc24aede3905082" "5159f439e8516f904859190cfd0375b7a4d05db2" "7c108bfa432bb4ff83e68e2ea1f884213ef29868" "97190407ff6df6ae497a54e632369afdf09cd621" "12dbe2245d86e86471aa84fb7656d3f422e1d6b6" "49733aa1ca831c8f507f6c0eae190e74c4c188d3" "f81fd2f617fbb538b0e48736020d89814f047321" "8ead32c3d109ae63ef89e4aa3b818aeb38b51d14" "aeddba56bfc6b1475cd7c298400145765f327a2f" "889e63b35e958b34d6cf15f62b243d442f1bac83" "64eb467661fb048cf581eb28e5ee0423136b4a02" "81465f23987dd2c482006411430ef171e856c5fe" "a01dc69a1e1fa54805fe9b48ce5c278a7e70de0c")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1824.ebuild b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1825.ebuild
similarity index 97%
rename from chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1824.ebuild
rename to chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1825.ebuild
index 113488e..1988210 100644
--- a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1824.ebuild
+++ b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1825.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="48dafe0185e0519022cce18049bca60f30dd94f1"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "545d67a6429090226f1d6ac899f5f2d86bd38b99" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "9c2074e601aedb8358ee3b7c367c62042409c577" "3b33fc07daf512e548300eefbd028b622bc51b44" "7ef75a42aba67052842459f221271e681184cc89" "876b666eae5a63a4d1573c7d9fb1196a78dd6fad" "78a28564de27e03edbd93427ebc24aede3905082" "f2f8d1e7f3179d4c0673c8fe56b7ae0478f065ef" "59d684e9494215dbc87a3be67ed3ef4ee21a39da" "369b6c3d6ddd2bbf6b89585b7e1a156954faebd9" "10821612029dc3c4e863c760f918e55433e669cf" "e2598f8160f0e1089268ae21cb458eb6bc46d71e" "7cae38f61d328484fe9d49f19fc2cb49eb89e883" "1ff86d1c03040927751e5f099ac70d0a3194f21b" "8ead32c3d109ae63ef89e4aa3b818aeb38b51d14" "477938c1f2459147988d2039df85eeda34202514" "bc7248c2839eb191c34aa68d63e57ed5eb70768d" "64eb467661fb048cf581eb28e5ee0423136b4a02" "81465f23987dd2c482006411430ef171e856c5fe")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "545d67a6429090226f1d6ac899f5f2d86bd38b99" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "9c2074e601aedb8358ee3b7c367c62042409c577" "3b33fc07daf512e548300eefbd028b622bc51b44" "7ef75a42aba67052842459f221271e681184cc89" "876b666eae5a63a4d1573c7d9fb1196a78dd6fad" "78a28564de27e03edbd93427ebc24aede3905082" "f2f8d1e7f3179d4c0673c8fe56b7ae0478f065ef" "59d684e9494215dbc87a3be67ed3ef4ee21a39da" "369b6c3d6ddd2bbf6b89585b7e1a156954faebd9" "10821612029dc3c4e863c760f918e55433e669cf" "e2598f8160f0e1089268ae21cb458eb6bc46d71e" "7cae38f61d328484fe9d49f19fc2cb49eb89e883" "1ff86d1c03040927751e5f099ac70d0a3194f21b" "8ead32c3d109ae63ef89e4aa3b818aeb38b51d14" "477938c1f2459147988d2039df85eeda34202514" "bc7248c2839eb191c34aa68d63e57ed5eb70768d" "64eb467661fb048cf581eb28e5ee0423136b4a02" "81465f23987dd2c482006411430ef171e856c5fe")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1

diff --git a/chromeos-base/vm_protos/vm_protos-0.0.1-r335.ebuild b/chromeos-base/vm_protos/vm_protos-0.0.1-r336.ebuild
similarity index 90%
rename from chromeos-base/vm_protos/vm_protos-0.0.1-r335.ebuild
rename to chromeos-base/vm_protos/vm_protos-0.0.1-r336.ebuild
index 6989997..0491359 100644
--- a/chromeos-base/vm_protos/vm_protos-0.0.1-r335.ebuild
+++ b/chromeos-base/vm_protos/vm_protos-0.0.1-r336.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "00ae29506296382180cec355ee3acb3662874ea9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "00ae29506296382180cec355ee3acb3662874ea9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/vm_tools/..."
 )

diff --git a/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2919.ebuild b/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2920.ebuild
similarity index 90%
rename from chromeos-base/vpn-manager/vpn-manager-0.0.1-r2919.ebuild
rename to chromeos-base/vpn-manager/vpn-manager-0.0.1-r2920.ebuild
index 6c53e35..2366403 100644
--- a/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2919.ebuild
+++ b/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2920.ebuild

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "462cb7ad367bdc196dd234e5bae863472f6d704b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "462cb7ad367bdc196dd234e5bae863472f6d704b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"

diff --git a/chromeos-base/vtpm/vtpm-0.0.1-r86.ebuild b/chromeos-base/vtpm/vtpm-0.0.1-r87.ebuild
similarity index 90%
rename from chromeos-base/vtpm/vtpm-0.0.1-r86.ebuild
rename to chromeos-base/vtpm/vtpm-0.0.1-r87.ebuild
index a0df08f..644f8ed 100644
--- a/chromeos-base/vtpm/vtpm-0.0.1-r86.ebuild
+++ b/chromeos-base/vtpm/vtpm-0.0.1-r87.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc72118a5d931e8b71614ca8b000048fdd02afb5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "5807b49f2a89205c10a0208e1124edffbff205af" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "5807b49f2a89205c10a0208e1124edffbff205af" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/webserver/webserver-0.0.1-r2485.ebuild b/chromeos-base/webserver/webserver-0.0.1-r2486.ebuild
similarity index 93%
rename from chromeos-base/webserver/webserver-0.0.1-r2485.ebuild
rename to chromeos-base/webserver/webserver-0.0.1-r2486.ebuild
index 8784a37..a523181 100644
--- a/chromeos-base/webserver/webserver-0.0.1-r2485.ebuild
+++ b/chromeos-base/webserver/webserver-0.0.1-r2486.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="8494d8409a8c7883908041202ee9008fdc903e19"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "78e6b102575514dd562d53f188ae1ed43deb839c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "78e6b102575514dd562d53f188ae1ed43deb839c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r268.ebuild b/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r269.ebuild
similarity index 89%
rename from chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r268.ebuild
rename to chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r269.ebuild
index 49b9262..fb833e6 100644
--- a/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r268.ebuild
+++ b/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r269.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "48152c166377a472e88e63a8996aeb920ac44e0a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "48152c166377a472e88e63a8996aeb920ac44e0a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/wilco_dtc/..."
 )

diff --git a/dev-go/perfetto-protos/perfetto-protos-17.0-r1183.ebuild b/dev-go/perfetto-protos/perfetto-protos-17.0-r1184.ebuild
similarity index 89%
rename from dev-go/perfetto-protos/perfetto-protos-17.0-r1183.ebuild
rename to dev-go/perfetto-protos/perfetto-protos-17.0-r1184.ebuild
index 9ed1dc8..4c73bb1 100644
--- a/dev-go/perfetto-protos/perfetto-protos-17.0-r1183.ebuild
+++ b/dev-go/perfetto-protos/perfetto-protos-17.0-r1184.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("9b95139ed2811e3ff27912bfaf31c8ace8dc4a14" "76862f1b45831d0aff823a2c7160a9b98e181a83")
-CROS_WORKON_TREE=("b64a8926dd779c2ee2ae89e9073436d8c49693e5" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT=("9b95139ed2811e3ff27912bfaf31c8ace8dc4a14" "d640cf36c1cb7d5b90023f4fb26b476a41d26b6f")
+CROS_WORKON_TREE=("b64a8926dd779c2ee2ae89e9073436d8c49693e5" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"android.googlesource.com/platform/external/perfetto/protos/perfetto/metrics/github.com/google/perfetto/perfetto_proto"
 	"android.googlesource.com/platform/external/perfetto/protos/perfetto/trace/github.com/google/perfetto/perfetto_proto"

diff --git a/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r229.ebuild b/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r230.ebuild
similarity index 97%
rename from dev-libs/libtextclassifier/libtextclassifier-0.0.1-r229.ebuild
rename to dev-libs/libtextclassifier/libtextclassifier-0.0.1-r230.ebuild
index f579c68..3f6a041 100644
--- a/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r229.ebuild
+++ b/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r230.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "01652c17e116baa8ebd7083e8cbc3dede513ac9e")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4fa2be0611424952390eb570106ed5944e294b46")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "01652c17e116baa8ebd7083e8cbc3dede513ac9e")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4fa2be0611424952390eb570106ed5944e294b46")
 CROS_WORKON_LOCALNAME=("../platform2" "libtextclassifier")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/libtextclassifier")
 CROS_WORKON_EGIT_BRANCH=("main" "master")

diff --git a/dev-libs/libutf/libutf-0.0.1-r180.ebuild b/dev-libs/libutf/libutf-0.0.1-r181.ebuild
similarity index 87%
rename from dev-libs/libutf/libutf-0.0.1-r180.ebuild
rename to dev-libs/libutf/libutf-0.0.1-r181.ebuild
index 0a9d6fb..f03114b 100644
--- a/dev-libs/libutf/libutf-0.0.1-r180.ebuild
+++ b/dev-libs/libutf/libutf-0.0.1-r181.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "c17bb435be940edf1aff81469215bb6a071f3c38")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fc022abae9d52285526cb0dda697e2bea18696ca")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "c17bb435be940edf1aff81469215bb6a071f3c38")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fc022abae9d52285526cb0dda697e2bea18696ca")
 CROS_WORKON_LOCALNAME=("../platform2" "../aosp/external/libutf")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/external/libutf")
 CROS_WORKON_EGIT_BRANCH=("main" "master")

diff --git a/dev-libs/ml-core/ml-core-0.0.1-r25.ebuild b/dev-libs/ml-core/ml-core-0.0.1-r26.ebuild
similarity index 84%
rename from dev-libs/ml-core/ml-core-0.0.1-r25.ebuild
rename to dev-libs/ml-core/ml-core-0.0.1-r26.ebuild
index 24ea485..341d96c 100644
--- a/dev-libs/ml-core/ml-core-0.0.1-r25.ebuild
+++ b/dev-libs/ml-core/ml-core-0.0.1-r26.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "4aad1773476a4fd5d6d51a5332a66ad94dd3aa13" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "4aad1773476a4fd5d6d51a5332a66ad94dd3aa13" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"

diff --git a/dev-libs/modp_b64/modp_b64-0.0.1-r242.ebuild b/dev-libs/modp_b64/modp_b64-0.0.1-r243.ebuild
similarity index 90%
rename from dev-libs/modp_b64/modp_b64-0.0.1-r242.ebuild
rename to dev-libs/modp_b64/modp_b64-0.0.1-r243.ebuild
index f587bb9..b271006 100644
--- a/dev-libs/modp_b64/modp_b64-0.0.1-r242.ebuild
+++ b/dev-libs/modp_b64/modp_b64-0.0.1-r243.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "269b6fb8401617b85e2dff7ae8a7b0f97613e2cd")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "9473949bc842cc166ac244567638b94150a97865")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "269b6fb8401617b85e2dff7ae8a7b0f97613e2cd")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "9473949bc842cc166ac244567638b94150a97865")
 inherit cros-constants
 
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/modp_b64")

diff --git a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r973.ebuild b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r974.ebuild
similarity index 88%
rename from media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r973.ebuild
rename to media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r974.ebuild
index 47798fe..0ec1c32 100644
--- a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r973.ebuild
+++ b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r974.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "2de57cadefcee72268944188060875f71560d058" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "2de57cadefcee72268944188060875f71560d058" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/hal/usb camera/include camera/tools common-mk"

diff --git a/media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r6.ebuild b/media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r7.ebuild
similarity index 89%
rename from media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r6.ebuild
rename to media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r7.ebuild
index 71e7398..e8c23d3 100644
--- a/media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r6.ebuild
+++ b/media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r7.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # iioservice/ is included just to make sandbox happy when running `gn gen`.

diff --git a/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r485.ebuild b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r486.ebuild
similarity index 86%
rename from media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r485.ebuild
rename to media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r486.ebuild
index a3e5e5f..0300d3d 100644
--- a/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r485.ebuild
+++ b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r486.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "318ca9f48604274cd31481e13eb9321be3d94d8f" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "318ca9f48604274cd31481e13eb9321be3d94d8f" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/tools/connector_client camera/common camera/include common-mk"

diff --git a/media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r107.ebuild b/media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r108.ebuild
similarity index 87%
rename from media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r107.ebuild
rename to media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r108.ebuild
index d427049..face2a5 100644
--- a/media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r107.ebuild
+++ b/media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r108.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "7627e6797f3edbcec56c490a77967a4d416ccf15" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "7627e6797f3edbcec56c490a77967a4d416ccf15" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/features/document_scanning common-mk"

diff --git a/media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r235.ebuild b/media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r236.ebuild
similarity index 87%
rename from media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r235.ebuild
rename to media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r236.ebuild
index 3c0ea0b..aa41d39 100644
--- a/media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r235.ebuild
+++ b/media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r236.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/include camera/gpu camera/common common-mk"

diff --git a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r242.ebuild b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r243.ebuild
similarity index 89%
rename from media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r242.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r243.ebuild
index 4b426bb9..16ce9b1 100644
--- a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r242.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r243.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "0db089197f74799a6a86522ab568a50a780bcbfb")
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "47aba8606dfa27f4b75305cae2a7a23857ccec2d")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "0db089197f74799a6a86522ab568a50a780bcbfb")
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "47aba8606dfa27f4b75305cae2a7a23857ccec2d")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/platform/camera")
 CROS_WORKON_LOCALNAME=("../platform2" "../platform/camera")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/camera_hal")

diff --git a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r813.ebuild b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r814.ebuild
similarity index 88%
rename from media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r813.ebuild
rename to media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r814.ebuild
index f05bb97..b08a76e 100644
--- a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r813.ebuild
+++ b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r814.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "9ff7c0ea2761e1863475bcd96a983e5e18089f57" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "9ff7c0ea2761e1863475bcd96a983e5e18089f57" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/hal/ip camera/hal/usb camera/include camera/mojo chromeos-config common-mk"

diff --git a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1208.ebuild b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1209.ebuild
similarity index 91%
rename from media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1208.ebuild
rename to media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1209.ebuild
index 4060388..762f59c 100644
--- a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1208.ebuild
+++ b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1209.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/809389): Avoid directly including headers from other packages.

diff --git a/media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r349.ebuild b/media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r350.ebuild
similarity index 89%
rename from media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r349.ebuild
rename to media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r350.ebuild
index 0f12997..c6b4421 100644
--- a/media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r349.ebuild
+++ b/media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r350.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # iioservice/ is included just to make sandbox happy when running `gn gen`.

diff --git a/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r786.ebuild b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r787.ebuild
similarity index 83%
rename from media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r786.ebuild
rename to media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r787.ebuild
index 31565a3..577933e 100644
--- a/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r786.ebuild
+++ b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r787.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"

diff --git a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r469.ebuild b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r470.ebuild
similarity index 84%
rename from media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r469.ebuild
rename to media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r470.ebuild
index 80b8e45..cdd80ae 100644
--- a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r469.ebuild
+++ b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r470.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"

diff --git a/media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r62.ebuild b/media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r63.ebuild
similarity index 96%
rename from media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r62.ebuild
rename to media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r63.ebuild
index fcfef24..234cfc8 100644
--- a/media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r62.ebuild
+++ b/media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r63.ebuild

@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="bc351184c9e87089a5c985fb829b2d76d1b79104"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "835ea099c8643676eca960bb95a9349559008807" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "835ea099c8643676eca960bb95a9349559008807" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/libfs common-mk"

diff --git a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r789.ebuild b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r790.ebuild
similarity index 82%
rename from media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r789.ebuild
rename to media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r790.ebuild
index 8bd3823..32d39b0 100644
--- a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r789.ebuild
+++ b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r790.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"

diff --git a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r842.ebuild b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r843.ebuild
similarity index 83%
rename from media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r842.ebuild
rename to media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r843.ebuild
index d4ff739..1dbfd24 100644
--- a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r842.ebuild
+++ b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r843.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"

diff --git a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r969.ebuild b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r970.ebuild
similarity index 90%
rename from media-libs/cros-camera-test/cros-camera-test-0.0.1-r969.ebuild
rename to media-libs/cros-camera-test/cros-camera-test-0.0.1-r970.ebuild
index 54b7d5e..77fb3f6 100644
--- a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r969.ebuild
+++ b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r970.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "97e2f0b1a81d232f739ef5fef9fa68657759387f" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "97e2f0b1a81d232f739ef5fef9fa68657759387f" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/809389): Avoid directly including headers from other packages.

diff --git a/media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r139.ebuild b/media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r140.ebuild
similarity index 88%
rename from media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r139.ebuild
rename to media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r140.ebuild
index 6219b01..9a3ec78 100644
--- a/media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r139.ebuild
+++ b/media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r140.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="116a9dd274c4615d435a2089ff7c8c3f3390f5df"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "81608e81e7a1a6aacd7096a66fd44588c1d5ece9")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "5ce03b99f33d64f242f02a09dcf165bdbad8d7d4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/hal/usb common-mk"

diff --git a/net-print/cups_proxy/cups_proxy-0.0.1-r315.ebuild b/net-print/cups_proxy/cups_proxy-0.0.1-r316.ebuild
similarity index 91%
rename from net-print/cups_proxy/cups_proxy-0.0.1-r315.ebuild
rename to net-print/cups_proxy/cups_proxy-0.0.1-r316.ebuild
index 3342189..375da4d 100644
--- a/net-print/cups_proxy/cups_proxy-0.0.1-r315.ebuild
+++ b/net-print/cups_proxy/cups_proxy-0.0.1-r316.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="9bbe3d4f06a612d74b364226851f121bd539e8c5"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "7b0ea4ad0dd55c624cbdc60df9bfaeea9b2481a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "7b0ea4ad0dd55c624cbdc60df9bfaeea9b2481a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"

diff --git a/net-wireless/floss/floss-0.0.2-r1434.ebuild b/net-wireless/floss/floss-0.0.2-r1435.ebuild
similarity index 97%
rename from net-wireless/floss/floss-0.0.2-r1434.ebuild
rename to net-wireless/floss/floss-0.0.2-r1435.ebuild
index 6fd90be..4afe899 100644
--- a/net-wireless/floss/floss-0.0.2-r1434.ebuild
+++ b/net-wireless/floss/floss-0.0.2-r1435.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("33c269d6685f571cacfe64880b0f19beb11437e9" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305" "fea37ca09aae56eb5a50f45991b206f92af1e7e8")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411" "97c098e228b4560e214854eadb06218a4f00b2dd")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305" "fea37ca09aae56eb5a50f45991b206f92af1e7e8")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411" "97c098e228b4560e214854eadb06218a4f00b2dd")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"aosp/platform/packages/modules/Bluetooth"

diff --git a/net-wireless/floss_tools/floss_tools-0.0.1-r222.ebuild b/net-wireless/floss_tools/floss_tools-0.0.1-r223.ebuild
similarity index 93%
rename from net-wireless/floss_tools/floss_tools-0.0.1-r222.ebuild
rename to net-wireless/floss_tools/floss_tools-0.0.1-r223.ebuild
index dbd71e1..d9c8674 100644
--- a/net-wireless/floss_tools/floss_tools-0.0.1-r222.ebuild
+++ b/net-wireless/floss_tools/floss_tools-0.0.1-r223.ebuild

@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("33c269d6685f571cacfe64880b0f19beb11437e9" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"aosp/platform/packages/modules/Bluetooth"

diff --git a/sys-apps/fitpicker/fitpicker-0.0.1-r2220.ebuild b/sys-apps/fitpicker/fitpicker-0.0.1-r2221.ebuild
similarity index 85%
rename from sys-apps/fitpicker/fitpicker-0.0.1-r2220.ebuild
rename to sys-apps/fitpicker/fitpicker-0.0.1-r2221.ebuild
index 7be8752..8346339 100644
--- a/sys-apps/fitpicker/fitpicker-0.0.1-r2220.ebuild
+++ b/sys-apps/fitpicker/fitpicker-0.0.1-r2221.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="0f30e679cfa077ec2b52502e778d50aa45738cc8"
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "4ece3f8f3d85b6237e276452a02c7c6044463211" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d640cf36c1cb7d5b90023f4fb26b476a41d26b6f"
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "4ece3f8f3d85b6237e276452a02c7c6044463211" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_DESTDIR="${S}"

diff --git a/sys-apps/mosys/mosys-1.2.3-r1452.ebuild b/sys-apps/mosys/mosys-1.2.3-r1453.ebuild
similarity index 94%
rename from sys-apps/mosys/mosys-1.2.3-r1452.ebuild
rename to sys-apps/mosys/mosys-1.2.3-r1453.ebuild
index ad2d57f..ab8ed49 100644
--- a/sys-apps/mosys/mosys-1.2.3-r1452.ebuild
+++ b/sys-apps/mosys/mosys-1.2.3-r1453.ebuild

@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0f30e679cfa077ec2b52502e778d50aa45738cc8" "73b4433e502690d622075f47dde18849bfbbb2a5")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "1ea13e9e3e2cc1fabd9775806e986787d736562b")
+CROS_WORKON_COMMIT=("d640cf36c1cb7d5b90023f4fb26b476a41d26b6f" "73b4433e502690d622075f47dde18849bfbbb2a5")
+CROS_WORKON_TREE=("5ce03b99f33d64f242f02a09dcf165bdbad8d7d4" "1ea13e9e3e2cc1fabd9775806e986787d736562b")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"chromiumos/platform/mosys"
commit	cf2bf61ca9de11376ae240f73694dbcfa656ced7	[log] [tgz]
author	chromeos-ci-prod <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>	Sat Aug 13 08:35:02 2022 -0700
committer	chromeos-ci-prod <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>	Sat Aug 13 08:35:02 2022 -0700
tree	61408e42570efd93826f23c912068dc2a0bc715f
parent	79e8303e9bb0173d6a9e589e12c7eda62cbf7249 [diff]