diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4382.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4383.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4382.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4383.ebuild
index e568faa..e3e8322 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4382.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4383.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7171.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7172.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7171.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7172.ebuild
index 101f654..9b3376e 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7171.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7172.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 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-r3055.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3056.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3055.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3056.ebuild
index 8b37867..ad9b13f 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3055.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3056.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 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-r7542.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7543.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7542.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7543.ebuild
index f5b369c..51e6b7e 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7542.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7543.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 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-r7522.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7523.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7522.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7523.ebuild
index 5e5f32c..990fedc 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7522.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7523.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7134.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7135.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7134.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7135.ebuild
index 1897fd1..10173d4 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7134.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7135.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11785.ebuild b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11786.ebuild
similarity index 90%
rename from chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11785.ebuild
rename to chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11786.ebuild
index 8309cef..c1551dd 100644
--- a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11785.ebuild
+++ b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11786.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 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-r3131.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3132.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3131.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3132.ebuild
index b4fd8f2..c507853 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3131.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3132.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 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-r8144.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8145.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8144.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8145.ebuild
index 8015625..ec62c5c 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8144.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8145.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7694.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7695.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7694.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7695.ebuild
index c8b39d7..4d7e8cf 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7694.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7695.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 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-r12361.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12362.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r12361.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r12362.ebuild
index f2f8e01..7c2570b 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12361.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12362.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r717.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r718.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r717.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r718.ebuild
index 678bea5..315d63c 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r717.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r718.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-tests/autotest-tests-0.0.4-r8829.ebuild b/chromeos-base/autotest-tests/autotest-tests-0.0.4-r8830.ebuild
similarity index 97%
rename from chromeos-base/autotest-tests/autotest-tests-0.0.4-r8829.ebuild
rename to chromeos-base/autotest-tests/autotest-tests-0.0.4-r8830.ebuild
index 52d39f4..640f97b 100644
--- a/chromeos-base/autotest-tests/autotest-tests-0.0.4-r8829.ebuild
+++ b/chromeos-base/autotest-tests/autotest-tests-0.0.4-r8830.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="6ea6c017616eb37b9c46094cd85dc892e6c8473e"
-CROS_WORKON_TREE="14a9d8076c902f08a568ddb20ec257b32a4154b2"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 
 inherit libchrome cros-workon autotest
@@ -177,7 +177,6 @@
 	+tests_platform_ImageLoader
 	+tests_platform_ImageLoaderServer
 	+tests_platform_KernelVersion
-	+tests_platform_KernelVersionByBoard
 	+tests_platform_LibCBench
 	+tests_platform_LogDupSuppression
 	+tests_platform_LogNonKernelKmsg
diff --git a/chromeos-base/autotest/autotest-0.0.2-r12366.ebuild b/chromeos-base/autotest/autotest-0.0.2-r12367.ebuild
similarity index 95%
rename from chromeos-base/autotest/autotest-0.0.2-r12366.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r12367.ebuild
index 94c4bcd..7208c76 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r12366.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r12367.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0" "c5889adab57bc6394a900a60d6f943f7918fef8d")
-CROS_WORKON_TREE=("4d74f3ae6800e167ea03dfa972be526663d7ad62" "dd84017ea39c62ab8790679abd24e7d37367ac48")
+CROS_WORKON_COMMIT=("413cd25b3cef93d30e6bc889b7bb461101b15858" "c5889adab57bc6394a900a60d6f943f7918fef8d")
+CROS_WORKON_TREE=("161be89d8ab32e37d1bf37474953ae7a5ffaa3ec" "dd84017ea39c62ab8790679abd24e7d37367ac48")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/crosh/crosh-0.24.52-r2994.ebuild b/chromeos-base/crosh/crosh-0.24.52-r2995.ebuild
similarity index 92%
rename from chromeos-base/crosh/crosh-0.24.52-r2994.ebuild
rename to chromeos-base/crosh/crosh-0.24.52-r2995.ebuild
index 03d248a..9665113 100644
--- a/chromeos-base/crosh/crosh-0.24.52-r2994.ebuild
+++ b/chromeos-base/crosh/crosh-0.24.52-r2995.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="2ca16e9eaad353b9d97e907a6098c4dc717f1d3a"
-CROS_WORKON_TREE="7f7e9f8a485e98c56fc4a18af24fedacf6d8defb"
+CROS_WORKON_COMMIT="06b968ac8625de66e62c7c1ff9137339f83c86e7"
+CROS_WORKON_TREE="8c03a2a5a0f1c22843551b011dc2cae529d54719"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"
diff --git a/chromeos-base/system_api-rust/system_api-rust-0.24.52-r193.ebuild b/chromeos-base/system_api-rust/system_api-rust-0.24.52-r194.ebuild
similarity index 89%
rename from chromeos-base/system_api-rust/system_api-rust-0.24.52-r193.ebuild
rename to chromeos-base/system_api-rust/system_api-rust-0.24.52-r194.ebuild
index f6283ff..06d3759 100644
--- a/chromeos-base/system_api-rust/system_api-rust-0.24.52-r193.ebuild
+++ b/chromeos-base/system_api-rust/system_api-rust-0.24.52-r194.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="c82d6d8e321f68b056238f372405b10e17a5686d"
-CROS_WORKON_TREE=("a0d8550678a1ed2a4ab62782049032a024bf40df" "0c25b69c1776f42439f6c28509e51d30da6f3f7a" "d289fda3c8ee1448b8cdf3425062327cde39dd8c" "1020d8c2f3ebc74e886811116084257c56c5e646")
+CROS_WORKON_COMMIT="06b968ac8625de66e62c7c1ff9137339f83c86e7"
+CROS_WORKON_TREE=("a0d8550678a1ed2a4ab62782049032a024bf40df" "0c25b69c1776f42439f6c28509e51d30da6f3f7a" "d289fda3c8ee1448b8cdf3425062327cde39dd8c" "a6479172cccf369b6ef5f900e29c122086a97f97")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE="authpolicy/dbus_bindings debugd/dbus_bindings login_manager/dbus_bindings system_api"
diff --git a/chromeos-base/system_api/system_api-0.0.1-r3990.ebuild b/chromeos-base/system_api/system_api-0.0.1-r3991.ebuild
similarity index 92%
rename from chromeos-base/system_api/system_api-0.0.1-r3990.ebuild
rename to chromeos-base/system_api/system_api-0.0.1-r3991.ebuild
index 8518873..5c0fdb7 100644
--- a/chromeos-base/system_api/system_api-0.0.1-r3990.ebuild
+++ b/chromeos-base/system_api/system_api-0.0.1-r3991.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c82d6d8e321f68b056238f372405b10e17a5686d"
-CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "1020d8c2f3ebc74e886811116084257c56c5e646" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="06b968ac8625de66e62c7c1ff9137339f83c86e7"
+CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "a6479172cccf369b6ef5f900e29c122086a97f97" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/system_api/..."
 )
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3186.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3187.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3186.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3187.ebuild
index 81254d3..1b024ec 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3186.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3187.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("85bd7054fcef301214de4aa7ac85a976ca8086f0" "7882f73dac265b4c5eb48a84c7c2201ff7012eed")
-CROS_WORKON_TREE=("adc13b667a1aad8f2f678e0efad6e7684391056f" "4a8db68dcd87e8909453f8880c06431869d2dbeb")
+CROS_WORKON_COMMIT=("dc7ea9c4633a52ffa75fae107d9e3c3771960c56" "7882f73dac265b4c5eb48a84c7c2201ff7012eed")
+CROS_WORKON_TREE=("0328f2419439ed7693d905e59422e205aa0a31fc" "4a8db68dcd87e8909453f8880c06431869d2dbeb")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3193.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3194.ebuild
similarity index 90%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3193.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3194.ebuild
index b0adc89..1af9d55 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3193.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3194.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("85bd7054fcef301214de4aa7ac85a976ca8086f0" "7882f73dac265b4c5eb48a84c7c2201ff7012eed" "c5889adab57bc6394a900a60d6f943f7918fef8d")
-CROS_WORKON_TREE=("adc13b667a1aad8f2f678e0efad6e7684391056f" "4a8db68dcd87e8909453f8880c06431869d2dbeb" "dd84017ea39c62ab8790679abd24e7d37367ac48")
+CROS_WORKON_COMMIT=("dc7ea9c4633a52ffa75fae107d9e3c3771960c56" "7882f73dac265b4c5eb48a84c7c2201ff7012eed" "c5889adab57bc6394a900a60d6f943f7918fef8d")
+CROS_WORKON_TREE=("0328f2419439ed7693d905e59422e205aa0a31fc" "4a8db68dcd87e8909453f8880c06431869d2dbeb" "dd84017ea39c62ab8790679abd24e7d37367ac48")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3214.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3215.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3214.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3215.ebuild
index c2e4a07..2604197 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3214.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3215.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="a3b13bff3ff3c8ab2a868153af3ff6d4ff8337d0"
-CROS_WORKON_TREE="4d74f3ae6800e167ea03dfa972be526663d7ad62"
+CROS_WORKON_COMMIT="413cd25b3cef93d30e6bc889b7bb461101b15858"
+CROS_WORKON_TREE="161be89d8ab32e37d1bf37474953ae7a5ffaa3ec"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r791.ebuild b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r792.ebuild
similarity index 92%
rename from chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r791.ebuild
rename to chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r792.ebuild
index db7309c..ce77e9f 100644
--- a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r791.ebuild
+++ b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r792.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="378a542fb56ab76c32481438dc38dc070d1da83f"
-CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "7bcfbe3c740c314c3d98ca87536abea087627c60" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="06b968ac8625de66e62c7c1ff9137339f83c86e7"
+CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "41567c5dcf798424281b437c0fc07fccbb3311b9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 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-r940.ebuild b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r941.ebuild
similarity index 95%
rename from chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r940.ebuild
rename to chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r941.ebuild
index ad255f2..a970df9 100644
--- a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r940.ebuild
+++ b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r941.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="378a542fb56ab76c32481438dc38dc070d1da83f"
-CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "7e189936f29d145c4191ea147e48256c92fac75d" "7bcfbe3c740c314c3d98ca87536abea087627c60" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="06b968ac8625de66e62c7c1ff9137339f83c86e7"
+CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "7e189936f29d145c4191ea147e48256c92fac75d" "41567c5dcf798424281b437c0fc07fccbb3311b9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1164.ebuild b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1165.ebuild
similarity index 91%
rename from media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1164.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1165.ebuild
index 4b52878..6da42d4 100644
--- a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1164.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1165.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="79b34a48b1f0e24ce225221fe5ba2622e3b2bbd6"
-CROS_WORKON_TREE="b875b5ee226a014144eab97968374eb6139316e6"
+CROS_WORKON_COMMIT="06b968ac8625de66e62c7c1ff9137339f83c86e7"
+CROS_WORKON_TREE="7c20147d561e7caf3625c9dcac1a53f430ab4348"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"