diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4941.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4942.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4941.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4942.ebuild
index 041aae1..c2d1d0d 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4941.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4942.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r7730.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7731.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7730.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7731.ebuild
index 3248fd7..a90eed8 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7730.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7731.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r3614.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3615.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3614.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3615.ebuild
index 0d13a32..072112a 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3614.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3615.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r8101.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8102.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8101.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8102.ebuild
index 2506ff6..610256a 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8101.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8102.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r8081.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8082.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8081.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8082.ebuild
index 9412477..b6d63a6 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8081.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8082.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r7693.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7694.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7693.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7694.ebuild
index f370f40..4235efb 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7693.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7694.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r12344.ebuild b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12345.ebuild
similarity index 90%
rename from chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12344.ebuild
rename to chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12345.ebuild
index 27a8840..017f9bc 100644
--- a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12344.ebuild
+++ b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12345.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r3690.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3691.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3690.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3691.ebuild
index f1afe38..d58d3e3 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3690.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3691.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r8703.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8704.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8703.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8704.ebuild
index fefc47e..f8cf257 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8703.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8704.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r8253.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8254.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8253.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8254.ebuild
index 7e8527d..97a9169 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8253.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8254.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r12920.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12921.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r12920.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r12921.ebuild
index 7ed3f37..3e98e55 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12920.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12921.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 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-r1276.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1277.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1276.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1277.ebuild
index d725363..c2dc86f 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1276.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1277.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r12942.ebuild b/chromeos-base/autotest/autotest-0.0.2-r12943.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r12942.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r12943.ebuild
index b601779..ab1ffa8 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r12942.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r12943.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("6cd152867fdea00945c5b63cbb4e2cb4264bfa3d" "4e80173ac59e4cab9ae07b919c1c367642d4516d")
-CROS_WORKON_TREE=("35addf2f593da52251be546a4bdf776ca2bb8a49" "0ae43237ada86ff051625b38e4bfb48ff0e7da45")
+CROS_WORKON_COMMIT=("642d7c54eec8a9cfc1408f12c5da77c3104fb8cf" "4e80173ac59e4cab9ae07b919c1c367642d4516d")
+CROS_WORKON_TREE=("fd87c6a0f2d02f1c67027003dda36aeb4ad418e0" "0ae43237ada86ff051625b38e4bfb48ff0e7da45")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/crosvm/crosvm-0.1.0-r1015.ebuild b/chromeos-base/crosvm/crosvm-0.1.0-r1016.ebuild
similarity index 97%
rename from chromeos-base/crosvm/crosvm-0.1.0-r1015.ebuild
rename to chromeos-base/crosvm/crosvm-0.1.0-r1016.ebuild
index 116f31d..b0f014f 100644
--- a/chromeos-base/crosvm/crosvm-0.1.0-r1015.ebuild
+++ b/chromeos-base/crosvm/crosvm-0.1.0-r1016.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="0cd3606024079a62ab6152289337a366c72be3c9"
-CROS_WORKON_TREE="1f207b218b465e04811cb7206bae5928588d9f12"
+CROS_WORKON_COMMIT="cf68ea6f3ee669751688b5afb6043d21cc3a1aca"
+CROS_WORKON_TREE="fc44890e0ae224c634e1479d81b82a83aa21b6d8"
 CROS_WORKON_PROJECT="chromiumos/platform/crosvm"
 CROS_WORKON_LOCALNAME="platform/crosvm"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3914.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3915.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3914.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3915.ebuild
index d3a444f..3f238ec 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3914.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3915.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("8a3ae3cf9d8c30bfbcee80830a596ec183f740d8" "2ad1b5ed63ac152ca9c5f907c9e093e16b14725a")
-CROS_WORKON_TREE=("7a129b2a1f95c1de4a59ccc9536250f36920424d" "00cb282746732284a2779c7d4e7dc75c5948f2ec")
+CROS_WORKON_COMMIT=("41575ce816631cf454023a65fda421844b91d4bc" "2ad1b5ed63ac152ca9c5f907c9e093e16b14725a")
+CROS_WORKON_TREE=("324bbd6f729f09b206cd961145e4ef4646baad1d" "00cb282746732284a2779c7d4e7dc75c5948f2ec")
 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-r3934.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3935.ebuild
similarity index 90%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3934.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3935.ebuild
index 2abbeb9..6c37aee 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3934.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3935.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("8a3ae3cf9d8c30bfbcee80830a596ec183f740d8" "2ad1b5ed63ac152ca9c5f907c9e093e16b14725a" "4e80173ac59e4cab9ae07b919c1c367642d4516d")
-CROS_WORKON_TREE=("7a129b2a1f95c1de4a59ccc9536250f36920424d" "00cb282746732284a2779c7d4e7dc75c5948f2ec" "0ae43237ada86ff051625b38e4bfb48ff0e7da45")
+CROS_WORKON_COMMIT=("41575ce816631cf454023a65fda421844b91d4bc" "2ad1b5ed63ac152ca9c5f907c9e093e16b14725a" "4e80173ac59e4cab9ae07b919c1c367642d4516d")
+CROS_WORKON_TREE=("324bbd6f729f09b206cd961145e4ef4646baad1d" "00cb282746732284a2779c7d4e7dc75c5948f2ec" "0ae43237ada86ff051625b38e4bfb48ff0e7da45")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3773.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3774.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3773.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3774.ebuild
index e6f9a44..c8179d4 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3773.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3774.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="6cd152867fdea00945c5b63cbb4e2cb4264bfa3d"
-CROS_WORKON_TREE="35addf2f593da52251be546a4bdf776ca2bb8a49"
+CROS_WORKON_COMMIT="642d7c54eec8a9cfc1408f12c5da77c3104fb8cf"
+CROS_WORKON_TREE="fd87c6a0f2d02f1c67027003dda36aeb4ad418e0"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/dev-rust/data_model/data_model-0.1.0-r22.ebuild b/dev-rust/data_model/data_model-0.1.0-r23.ebuild
similarity index 88%
rename from dev-rust/data_model/data_model-0.1.0-r22.ebuild
rename to dev-rust/data_model/data_model-0.1.0-r23.ebuild
index 3430eaa..21f190c 100644
--- a/dev-rust/data_model/data_model-0.1.0-r22.ebuild
+++ b/dev-rust/data_model/data_model-0.1.0-r23.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="156cea0d433b9a511293daa5f9ae57b890e204a6"
-CROS_WORKON_TREE="4428da423ab66ad5cf5dc237d399c2df9626ca20"
+CROS_WORKON_COMMIT="cf68ea6f3ee669751688b5afb6043d21cc3a1aca"
+CROS_WORKON_TREE="1e18252db621cfaf3c220ff487f74be018a47c38"
 CROS_WORKON_LOCALNAME="../platform/crosvm"
 CROS_WORKON_PROJECT="chromiumos/platform/crosvm"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/media-libs/arc-mesa-freedreno/arc-mesa-freedreno-20.3.0_pre-r41.ebuild b/media-libs/arc-mesa-freedreno/arc-mesa-freedreno-20.3.0_pre-r42.ebuild
similarity index 95%
rename from media-libs/arc-mesa-freedreno/arc-mesa-freedreno-20.3.0_pre-r41.ebuild
rename to media-libs/arc-mesa-freedreno/arc-mesa-freedreno-20.3.0_pre-r42.ebuild
index a82ace2..9ac7a05 100644
--- a/media-libs/arc-mesa-freedreno/arc-mesa-freedreno-20.3.0_pre-r41.ebuild
+++ b/media-libs/arc-mesa-freedreno/arc-mesa-freedreno-20.3.0_pre-r42.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="b29c13480e242f488f24290300538713a5d35e85"
-CROS_WORKON_TREE="edec47b0550362cfcea2ee4f7a7c3403cad0ae1b"
+CROS_WORKON_COMMIT="772f8052b3f83c30476a7e4211a0ec29c4a2e8c7"
+CROS_WORKON_TREE="709132dcdf35676fc5ef0aa29e20d043aa4a5dd6"
 CROS_WORKON_PROJECT="chromiumos/third_party/mesa"
 CROS_WORKON_LOCALNAME="mesa-freedreno"
 
diff --git a/media-libs/mesa-freedreno/mesa-freedreno-20.3.0_pre-r35.ebuild b/media-libs/mesa-freedreno/mesa-freedreno-20.3.0_pre-r36.ebuild
similarity index 90%
rename from media-libs/mesa-freedreno/mesa-freedreno-20.3.0_pre-r35.ebuild
rename to media-libs/mesa-freedreno/mesa-freedreno-20.3.0_pre-r36.ebuild
index 6c604ec..c06f633 100644
--- a/media-libs/mesa-freedreno/mesa-freedreno-20.3.0_pre-r35.ebuild
+++ b/media-libs/mesa-freedreno/mesa-freedreno-20.3.0_pre-r36.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b29c13480e242f488f24290300538713a5d35e85"
-CROS_WORKON_TREE="edec47b0550362cfcea2ee4f7a7c3403cad0ae1b"
+CROS_WORKON_COMMIT="772f8052b3f83c30476a7e4211a0ec29c4a2e8c7"
+CROS_WORKON_TREE="709132dcdf35676fc5ef0aa29e20d043aa4a5dd6"
 CROS_WORKON_PROJECT="chromiumos/third_party/mesa"
 CROS_WORKON_LOCALNAME="mesa-freedreno"
 CROS_WORKON_EGIT_BRANCH="chromeos-freedreno"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.68-r1258.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.68-r1259.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.68-r1258.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.68-r1259.ebuild
index 3001828..f50278c 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.68-r1258.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.68-r1259.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="6c2bd3362ebd46c54de9e978f79628117561770e"
-CROS_WORKON_TREE="d68b95d6262fe94b1f35b252d5bd3e91ad3583fd"
+CROS_WORKON_COMMIT="0f5decf887bfe7a8683aac6f9dbe4d828f045861"
+CROS_WORKON_TREE="7fdaa56f176a882e8d7f0c878003d734fe26d8a7"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"