diff --git a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10777.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10778.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10777.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10778.ebuild
index 82fef9d..f9da083 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10777.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10778.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r6661.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6662.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6661.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6662.ebuild
index 6cbbaf9..c3c76ea 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6661.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6662.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r11148.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11149.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11148.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11149.ebuild
index 03a1323..0cbcb01 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11148.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11149.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r11128.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11129.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11128.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11129.ebuild
index 0277bf2..9108bd7 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11128.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11129.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r6737.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6738.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6737.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6738.ebuild
index 5709c83..027bed2 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6737.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6738.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r11752.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11753.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11752.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11753.ebuild
index 5d19f3d..6abe3b4 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11752.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11753.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r11300.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11301.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11300.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11301.ebuild
index bda886e..c5745e8 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11300.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11301.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r15970.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15971.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r15970.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r15971.ebuild
index 0cdfcb2..45dd9e7 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15970.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15971.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3522.ebuild b/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3523.ebuild
similarity index 92%
rename from chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3522.ebuild
rename to chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3523.ebuild
index b3bc95f..e3c5923 100644
--- a/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3522.ebuild
+++ b/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3523.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="d4dbce90833328db60ba9ad585f438cea19cad19"
-CROS_WORKON_TREE="6ec33cf8d1da6f4a2ecefe05306b4b5b0192dcc5"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r3687.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3688.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3687.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3688.ebuild
index bf16bec..42aa25a 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3687.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3688.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r3866.ebuild b/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3867.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3866.ebuild
rename to chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3867.ebuild
index 9b1540d..71108a8 100644
--- a/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3866.ebuild
+++ b/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3867.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r697.ebuild b/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r698.ebuild
similarity index 85%
rename from chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r697.ebuild
rename to chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r698.ebuild
index e6b624d..a7b94e0 100644
--- a/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r697.ebuild
+++ b/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r698.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 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-r4325.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4326.ebuild
similarity index 84%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4325.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4326.ebuild
index d5d191f..77e3dfa 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4325.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4326.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest/autotest-0.0.2-r16229.ebuild b/chromeos-base/autotest/autotest-0.0.2-r16230.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r16229.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r16230.ebuild
index e57ee7a..78d9051 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r16229.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r16230.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("95817555154e03c0e8c0041edfc89da1793b67fb" "7f05c2f0254be615ce1ed3e81f3cca5fc9f1f0e5" "fdcd88182cfd3d40596011819c24bb4927e82d1e")
-CROS_WORKON_TREE=("6a73a3b9893611d68f40462d2c15d7af94c522b8" "360559203d537727a34f0267da818a5260a642fa" "3b88e01b4c689a52c6a8eed97043023877ad2278")
+CROS_WORKON_COMMIT=("f5ab7c099e7a09ea07bf1587267462d6e342d1ec" "7f05c2f0254be615ce1ed3e81f3cca5fc9f1f0e5" "fdcd88182cfd3d40596011819c24bb4927e82d1e")
+CROS_WORKON_TREE=("1427c4c960670d99c8e2de8aa3ad2ad5f08da014" "360559203d537727a34f0267da818a5260a642fa" "3b88e01b4c689a52c6a8eed97043023877ad2278")
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6823.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6824.ebuild
similarity index 84%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6823.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6824.ebuild
index f7660bb..a13bf04 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6823.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6824.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="95817555154e03c0e8c0041edfc89da1793b67fb"
-CROS_WORKON_TREE="6a73a3b9893611d68f40462d2c15d7af94c522b8"
+CROS_WORKON_COMMIT="f5ab7c099e7a09ea07bf1587267462d6e342d1ec"
+CROS_WORKON_TREE="1427c4c960670d99c8e2de8aa3ad2ad5f08da014"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/net-wireless/floss/floss-0.0.2-r1433.ebuild b/net-wireless/floss/floss-0.0.2-r1434.ebuild
similarity index 97%
rename from net-wireless/floss/floss-0.0.2-r1433.ebuild
rename to net-wireless/floss/floss-0.0.2-r1434.ebuild
index be4376e..6fd90be 100644
--- a/net-wireless/floss/floss-0.0.2-r1433.ebuild
+++ b/net-wireless/floss/floss-0.0.2-r1434.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("33c269d6685f571cacfe64880b0f19beb11437e9" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305" "cdf54cfef835f78b29afae61214496086b78c8d9")
-CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411" "185bdd31753104436a200cff545266ddc9501f4b")
+CROS_WORKON_COMMIT=("33c269d6685f571cacfe64880b0f19beb11437e9" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305" "fea37ca09aae56eb5a50f45991b206f92af1e7e8")
+CROS_WORKON_TREE=("81608e81e7a1a6aacd7096a66fd44588c1d5ece9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411" "97c098e228b4560e214854eadb06218a4f00b2dd")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"aosp/platform/packages/modules/Bluetooth"