diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5464.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5465.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5464.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5465.ebuild
index b8fc69f..e78687c 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5464.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5465.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r8253.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8254.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8253.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8254.ebuild
index 2f0fc3c..d7c90a3 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8253.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-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="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r4137.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4138.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4137.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4138.ebuild
index 48532ec..de4e7e8 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4137.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4138.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r8624.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8625.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8624.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8625.ebuild
index b222962..20b479a 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8624.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8625.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r8604.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8605.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8604.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8605.ebuild
index d888e76..6b1a6fd 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8604.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8605.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r8216.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8217.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8216.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8217.ebuild
index c1bb1c1..5fff5b0 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8216.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8217.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r4213.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4214.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4213.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4214.ebuild
index b06f3603..95711ca 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4213.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4214.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r9226.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9227.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9226.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9227.ebuild
index 2d4d9bf..4c04b82 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9226.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9227.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r8776.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8777.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8776.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8777.ebuild
index d6906b2..c9be68f 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8776.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8777.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r13443.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13444.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r13443.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r13444.ebuild
index 2788690..d1c4c1f 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13443.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13444.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3401.ebuild b/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3402.ebuild
similarity index 91%
rename from chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3401.ebuild
rename to chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3402.ebuild
index 086c8a9..58f641c 100644
--- a/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3401.ebuild
+++ b/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3402.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="a2f8a98dfef446975f911e639bcd875449fdce93"
-CROS_WORKON_TREE="126f5870fa7d8ada27a6a3f2fced467adff30c10"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1161.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1162.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1161.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1162.ebuild
index 27ca2ba..0a84d14 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1161.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1162.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 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-r1799.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1800.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1799.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1800.ebuild
index 2ad6cfe..8d329da 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1799.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1800.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r13479.ebuild b/chromeos-base/autotest/autotest-0.0.2-r13480.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r13479.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r13480.ebuild
index 9249b41..74d4f41 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r13479.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r13480.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("87b1019fda20db08d713af51eb75ab20e7349fd0" "360170e747b466e5b884cb5f50a303dfedaba6be")
-CROS_WORKON_TREE=("639f43b7f34d266290b18726d838f91bbe79281a" "7c21ad286a49cc09ef2bd9f6c03939f016e9c889")
+CROS_WORKON_COMMIT=("db48601acf9d646e8f4b4c223e67da2d40cf02e6" "360170e747b466e5b884cb5f50a303dfedaba6be")
+CROS_WORKON_TREE=("9c318efb5bd9aef8b16389f9f2573412b9e576cc" "7c21ad286a49cc09ef2bd9f6c03939f016e9c889")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4296.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4297.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4296.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4297.ebuild
index ac918ab..2d4bfbd 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4296.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4297.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="87b1019fda20db08d713af51eb75ab20e7349fd0"
-CROS_WORKON_TREE="639f43b7f34d266290b18726d838f91bbe79281a"
+CROS_WORKON_COMMIT="db48601acf9d646e8f4b4c223e67da2d40cf02e6"
+CROS_WORKON_TREE="9c318efb5bd9aef8b16389f9f2573412b9e576cc"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"