diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4336.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4337.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4336.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4337.ebuild
index 26b5ea4..f774af8 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4336.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4337.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r7125.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7126.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7125.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7126.ebuild
index 2e4f9cc..60a2af8 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7125.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7126.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r3009.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3010.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3009.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3010.ebuild
index 02605ec..d880f87 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3009.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3010.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r7496.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7497.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7496.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7497.ebuild
index b8169a6..18ec5d6 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7496.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7497.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r7476.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7477.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7476.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7477.ebuild
index b509a56..3b54f34 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7476.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7477.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r7088.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7089.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7088.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7089.ebuild
index 33faa62..91f5946 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7088.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7089.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r11739.ebuild b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11740.ebuild
similarity index 90%
rename from chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11739.ebuild
rename to chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11740.ebuild
index 16068c3..cfbde51 100644
--- a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11739.ebuild
+++ b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11740.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r3085.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3086.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3085.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3086.ebuild
index bfebb55..cde4858 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3085.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3086.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r8098.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8099.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8098.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8099.ebuild
index b9d3c26..a1712ad 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8098.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8099.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r7648.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7649.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7648.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7649.ebuild
index abb4b50..58f3319 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7648.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7649.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r12315.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12316.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r12315.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r12316.ebuild
index 17dfcc8..ab5ea43 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12315.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12316.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4600.ebuild b/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4601.ebuild
similarity index 98%
rename from chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4600.ebuild
rename to chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4601.ebuild
index 3189208..83ee4f0 100644
--- a/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4600.ebuild
+++ b/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4601.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="36c678bb381b180b32bbef777248855b9a852a8e"
-CROS_WORKON_TREE="f3d7b64692e1de80291efb83f47772955b54af2b"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 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-r671.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r672.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r671.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r672.ebuild
index dddbfa2..c9e9c2f 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r671.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r672.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r12319.ebuild b/chromeos-base/autotest/autotest-0.0.2-r12320.ebuild
similarity index 95%
rename from chromeos-base/autotest/autotest-0.0.2-r12319.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r12320.ebuild
index c2181e8..a796c2a 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r12319.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r12320.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("32f86c36dce11173d74ee155306005a61d2f9bdf" "e45d88df6c96dcb818adf6506e334cd0f97430cf")
-CROS_WORKON_TREE=("387364b7c75b6d1b3aa342682aa0ba658a3318a6" "59dedefa635c597c102f62e723bf08b78d0193ba")
+CROS_WORKON_COMMIT=("265862f3799dce905fa44ea996d066410aa34d4e" "e45d88df6c96dcb818adf6506e334cd0f97430cf")
+CROS_WORKON_TREE=("d12348bec5ec89d4f8be3acdf0220feaba5cf80f" "59dedefa635c597c102f62e723bf08b78d0193ba")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/cbor/cbor-0.0.1-r31.ebuild b/chromeos-base/cbor/cbor-0.0.1-r32.ebuild
similarity index 85%
rename from chromeos-base/cbor/cbor-0.0.1-r31.ebuild
rename to chromeos-base/cbor/cbor-0.0.1-r32.ebuild
index 1885064..5e7cb1f 100644
--- a/chromeos-base/cbor/cbor-0.0.1-r31.ebuild
+++ b/chromeos-base/cbor/cbor-0.0.1-r32.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("c142078820d0707858873cedb290a78d36f531af" "50b7da853146eefb17ada6047865f22a4af53bc6")
-CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "f8d6d47167ee3dc32e8fb75f6db76f2bcc3c599c")
+CROS_WORKON_COMMIT=("60b8a10c6a4925d88abba0265632c52771dec20e" "2f808cae22b72aab029623efad3d9a71440ac6a1")
+CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "64ddc93776d2e8ce9987bcce636e68a05565c96f")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"chromiumos/platform/cbor"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3168.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3169.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3168.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3169.ebuild
index 6d2ceae..fc54819 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3168.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3169.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="32f86c36dce11173d74ee155306005a61d2f9bdf"
-CROS_WORKON_TREE="387364b7c75b6d1b3aa342682aa0ba658a3318a6"
+CROS_WORKON_COMMIT="265862f3799dce905fa44ea996d066410aa34d4e"
+CROS_WORKON_TREE="d12348bec5ec89d4f8be3acdf0220feaba5cf80f"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"