diff --git a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10772.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10773.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10772.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10773.ebuild
index c632f40..70e2a2a 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10772.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10773.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6656.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6657.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6656.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6657.ebuild
index 70fe496..be2d6e0 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6656.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6657.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11143.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11144.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11143.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11144.ebuild
index 08b95a3..09b975a 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11143.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11144.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11123.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11124.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11123.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11124.ebuild
index 85b825a..e9fb105 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11123.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11124.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6732.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6733.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6732.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6733.ebuild
index 11d2b7b..2cdc24e 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6732.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6733.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11747.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11748.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11747.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11748.ebuild
index a478161..7bbe7ef 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11747.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11748.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11295.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11296.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11295.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11296.ebuild
index 8e9579d..3699853 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11295.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11296.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15965.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15966.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r15965.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r15966.ebuild
index 035864c..91c531e 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15965.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15966.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3682.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3683.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3682.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3683.ebuild
index 82590e8..7fcb55f 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3682.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3683.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3861.ebuild b/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3862.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3861.ebuild
rename to chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3862.ebuild
index ab04a42..24f7b0f 100644
--- a/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3861.ebuild
+++ b/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3862.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r692.ebuild b/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r693.ebuild
similarity index 85%
rename from chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r692.ebuild
rename to chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r693.ebuild
index 4472b4f..9791b42 100644
--- a/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r692.ebuild
+++ b/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r693.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4320.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4321.ebuild
similarity index 84%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4320.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4321.ebuild
index 468956c..180a400 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4320.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4321.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest/autotest-0.0.2-r16224.ebuild b/chromeos-base/autotest/autotest-0.0.2-r16225.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r16224.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r16225.ebuild
index c286f07..c70d4ac 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r16224.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r16225.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("e630805b0e77f8a7d609c99d1aac4eafaffa2883" "a4f705def138db6168c552ecd3bf9fc711cb7551" "fdcd88182cfd3d40596011819c24bb4927e82d1e")
-CROS_WORKON_TREE=("137e20c598095d68e321d3b84a7209de863e2aa2" "360559203d537727a34f0267da818a5260a642fa" "3b88e01b4c689a52c6a8eed97043023877ad2278")
+CROS_WORKON_COMMIT=("19219c623c25ea767f1e75369840abb7f4a105c5" "a4f705def138db6168c552ecd3bf9fc711cb7551" "fdcd88182cfd3d40596011819c24bb4927e82d1e")
+CROS_WORKON_TREE=("4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1" "360559203d537727a34f0267da818a5260a642fa" "3b88e01b4c689a52c6a8eed97043023877ad2278")
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9172.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9173.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9172.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9173.ebuild
index 1d6efe4..5641449 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9172.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9173.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("2c54567d3cb5582455a290347ab4971a29d5149c" "190f1cb3d5d8be5427a6853ef92edd5f166ebae8")
-CROS_WORKON_TREE=("d41cb50281a6f7c8506eab9efef126d0cbdbb2d6" "3160ba00fb2574cb4a584b5da95c782200a542e1")
+CROS_WORKON_COMMIT=("404f8181c690f251e2ed6dffc89582e8f32df684" "190f1cb3d5d8be5427a6853ef92edd5f166ebae8")
+CROS_WORKON_TREE=("7d3932ee74171802d4fa4354ea1763326cd284a7" "3160ba00fb2574cb4a584b5da95c782200a542e1")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13737.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13738.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13737.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13738.ebuild
index ea22e44..86d86c7 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13737.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13738.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("2c54567d3cb5582455a290347ab4971a29d5149c" "11a97df4133f905bbdf9ddb48b5d56d617ec949b")
-CROS_WORKON_TREE=("d41cb50281a6f7c8506eab9efef126d0cbdbb2d6" "cafc71cae4ef6b3e7e64648b257b3f0ca2300e1d")
+CROS_WORKON_COMMIT=("404f8181c690f251e2ed6dffc89582e8f32df684" "11a97df4133f905bbdf9ddb48b5d56d617ec949b")
+CROS_WORKON_TREE=("7d3932ee74171802d4fa4354ea1763326cd284a7" "cafc71cae4ef6b3e7e64648b257b3f0ca2300e1d")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5595.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5596.ebuild
similarity index 93%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5595.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5596.ebuild
index df1529c..14b1646 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5595.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5596.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("2c54567d3cb5582455a290347ab4971a29d5149c" "11a97df4133f905bbdf9ddb48b5d56d617ec949b")
-CROS_WORKON_TREE=("d41cb50281a6f7c8506eab9efef126d0cbdbb2d6" "cafc71cae4ef6b3e7e64648b257b3f0ca2300e1d")
+CROS_WORKON_COMMIT=("404f8181c690f251e2ed6dffc89582e8f32df684" "11a97df4133f905bbdf9ddb48b5d56d617ec949b")
+CROS_WORKON_TREE=("7d3932ee74171802d4fa4354ea1763326cd284a7" "cafc71cae4ef6b3e7e64648b257b3f0ca2300e1d")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4464.ebuild b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4465.ebuild
similarity index 94%
rename from chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4464.ebuild
rename to chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4465.ebuild
index 1fdde3d..3dccfef 100644
--- a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4464.ebuild
+++ b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4465.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("1f693c6a449f5eeec9b74e944cb52acb0dd242ae" "45216bc4be443ec7c48a26cd958cb1a951564dec" "74a5a2025e40b599ffc71a68efd3444b0daf30a9" "0cdcea9140d23ce6f739850f93dcf3a2f4f6e4d4" "2c54567d3cb5582455a290347ab4971a29d5149c")
-CROS_WORKON_TREE=("9de9ff0501bdfe533bf73f5933206f6d076b61d8" "27307ed38fd548a34915387bf3477456118b7e2a" "fa09b2c5e1b0265e807e3348cf0c7a8caf850bb0" "b7cd5b19f195084b4849c677b63f4e4288042998" "d41cb50281a6f7c8506eab9efef126d0cbdbb2d6")
+CROS_WORKON_COMMIT=("1f693c6a449f5eeec9b74e944cb52acb0dd242ae" "45216bc4be443ec7c48a26cd958cb1a951564dec" "74a5a2025e40b599ffc71a68efd3444b0daf30a9" "0cdcea9140d23ce6f739850f93dcf3a2f4f6e4d4" "404f8181c690f251e2ed6dffc89582e8f32df684")
+CROS_WORKON_TREE=("9de9ff0501bdfe533bf73f5933206f6d076b61d8" "27307ed38fd548a34915387bf3477456118b7e2a" "fa09b2c5e1b0265e807e3348cf0c7a8caf850bb0" "b7cd5b19f195084b4849c677b63f4e4288042998" "7d3932ee74171802d4fa4354ea1763326cd284a7")
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/zephyr"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r11742.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r11743.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r11742.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r11743.ebuild
index 7af76b7..a43b802 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r11742.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r11743.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="2c54567d3cb5582455a290347ab4971a29d5149c"
-CROS_WORKON_TREE="d41cb50281a6f7c8506eab9efef126d0cbdbb2d6"
+CROS_WORKON_COMMIT="404f8181c690f251e2ed6dffc89582e8f32df684"
+CROS_WORKON_TREE="7d3932ee74171802d4fa4354ea1763326cd284a7"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 PYTHON_COMPAT=( python3_{6..9} )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10847.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10848.ebuild
similarity index 89%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10847.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10848.ebuild
index c64352c..be34d79 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10847.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10848.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="2c54567d3cb5582455a290347ab4971a29d5149c"
-CROS_WORKON_TREE="d41cb50281a6f7c8506eab9efef126d0cbdbb2d6"
+CROS_WORKON_COMMIT="404f8181c690f251e2ed6dffc89582e8f32df684"
+CROS_WORKON_TREE="7d3932ee74171802d4fa4354ea1763326cd284a7"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ec-utils/ec-utils-0.0.2-r13675.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r13676.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r13675.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r13676.ebuild
index 0369ff8..168f343 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r13675.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r13676.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="2c54567d3cb5582455a290347ab4971a29d5149c"
-CROS_WORKON_TREE="d41cb50281a6f7c8506eab9efef126d0cbdbb2d6"
+CROS_WORKON_COMMIT="404f8181c690f251e2ed6dffc89582e8f32df684"
+CROS_WORKON_TREE="7d3932ee74171802d4fa4354ea1763326cd284a7"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6818.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6819.ebuild
similarity index 84%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6818.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6819.ebuild
index 0da7dd1..6c49dc0 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6818.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6819.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="e630805b0e77f8a7d609c99d1aac4eafaffa2883"
-CROS_WORKON_TREE="137e20c598095d68e321d3b84a7209de863e2aa2"
+CROS_WORKON_COMMIT="19219c623c25ea767f1e75369840abb7f4a105c5"
+CROS_WORKON_TREE="4e848ecb39ee6d9ff8aaa33a238bfcaad783a8f1"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3321.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3322.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3321.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3322.ebuild
index 65970e9..d7f6ad7 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3321.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3322.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="d6c364dcc390696fffb6d2860bb2901114b271fe"
-CROS_WORKON_TREE="f4a7358047d0022946687eeca17df055a8d88b67"
+CROS_WORKON_COMMIT="89387437ede2cd1f85626a88a367ceec0d6df1ca"
+CROS_WORKON_TREE="b9247cc39a80987ae09e1df5afbd871c972c0a6d"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"