diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r7284.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r7285.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r7284.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r7285.ebuild
index a18b16d..9fc1017 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r7284.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r7285.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10072.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10073.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10072.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10073.ebuild
index 3f25c4b..59faa60 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10072.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10073.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 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-r5956.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5957.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5956.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5957.ebuild
index 5fb7d8d..5b2eec6 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5956.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5957.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 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-r10443.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r10444.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r10443.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r10444.ebuild
index 3a6d2a3..70cf522 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r10443.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r10444.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 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-r10423.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r10424.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r10423.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r10424.ebuild
index 976b647..7bc391b 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r10423.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r10424.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 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-r6032.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6033.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6032.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6033.ebuild
index a331e5c..f1b69dc 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6032.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6033.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 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-r11046.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11047.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11046.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11047.ebuild
index ab15131..0501288 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11046.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11047.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10595.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10596.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10595.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10596.ebuild
index 1b6b34e..4a19707 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10595.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10596.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 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-r15264.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15265.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r15264.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r15265.ebuild
index 8ba6c64..1f49ff5 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15264.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15265.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r309.ebuild b/chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r310.ebuild
similarity index 83%
rename from chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r309.ebuild
rename to chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r310.ebuild
index 7532828..366bde3 100644
--- a/chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r309.ebuild
+++ b/chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r310.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="a5fa6a922acff33203f3f1db221b3161493e7a7f"
-CROS_WORKON_TREE="cbe72c01d9cab777d1d3e4cb150bad89e0cfa0eb"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 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-r2981.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2982.ebuild
similarity index 89%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2981.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2982.ebuild
index 1719243..09dbfdb 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2981.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2982.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3619.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3620.ebuild
similarity index 84%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3619.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3620.ebuild
index 4caa97c..90457f8 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3619.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3620.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest/autotest-0.0.2-r15463.ebuild b/chromeos-base/autotest/autotest-0.0.2-r15464.ebuild
similarity index 95%
rename from chromeos-base/autotest/autotest-0.0.2-r15463.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r15464.ebuild
index 0f62d10..258a1d8 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r15463.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r15464.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81" "85724b2f8035d1a3945f58bbc6d469da0b1aa39b" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
-CROS_WORKON_TREE=("892f23b1417ad8574ed3217510b5b05bef84ec02" "060563e90e9843d94603f66795083543b5498ec0" "dad0497090bce4480ce6b88ada1f4187c960ccf2")
+CROS_WORKON_COMMIT=("60ac81314efc8b9afa57bfed98402b9250a51128" "df267db507a4844cc1f050968de2841f418e1ebb" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
+CROS_WORKON_TREE=("72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2" "060563e90e9843d94603f66795083543b5498ec0" "dad0497090bce4480ce6b88ada1f4187c960ccf2")
 PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7572.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7573.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7572.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7573.ebuild
index 8fd379a..279c4e9 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7572.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7573.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("1e70180175e02fe2465b7c676d862f6cc6e88529" "8d39e763aca72c79049009865fe164f59b6c6035")
-CROS_WORKON_TREE=("c491e0df4734366a1e73f5ba960c7d396bc3d72e" "89e25f3d9d509134c56925218400e73b2e911dc9")
+CROS_WORKON_COMMIT=("acaf450e8a3692b897605c2b5e4a0a2130b581fb" "8d39e763aca72c79049009865fe164f59b6c6035")
+CROS_WORKON_TREE=("93b1311f87d5a657b4e1f7d5406c477345293598" "89e25f3d9d509134c56925218400e73b2e911dc9")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r12162.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r12163.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r12162.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r12163.ebuild
index 9a7be6f..bf5723a 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r12162.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r12163.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("1e70180175e02fe2465b7c676d862f6cc6e88529" "92221d4688ed01cc361f01d650b82bf7e28078b2")
-CROS_WORKON_TREE=("c491e0df4734366a1e73f5ba960c7d396bc3d72e" "2aeca3cffd0e69db866b5623819ecd5bf8db1232")
+CROS_WORKON_COMMIT=("acaf450e8a3692b897605c2b5e4a0a2130b581fb" "92221d4688ed01cc361f01d650b82bf7e28078b2")
+CROS_WORKON_TREE=("93b1311f87d5a657b4e1f7d5406c477345293598" "2aeca3cffd0e69db866b5623819ecd5bf8db1232")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r4019.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r4020.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r4019.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r4020.ebuild
index f9f37a6..b6a2690 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r4019.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r4020.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("1e70180175e02fe2465b7c676d862f6cc6e88529" "92221d4688ed01cc361f01d650b82bf7e28078b2")
-CROS_WORKON_TREE=("c491e0df4734366a1e73f5ba960c7d396bc3d72e" "2aeca3cffd0e69db866b5623819ecd5bf8db1232")
+CROS_WORKON_COMMIT=("acaf450e8a3692b897605c2b5e4a0a2130b581fb" "92221d4688ed01cc361f01d650b82bf7e28078b2")
+CROS_WORKON_TREE=("93b1311f87d5a657b4e1f7d5406c477345293598" "2aeca3cffd0e69db866b5623819ecd5bf8db1232")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r2756.ebuild b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r2757.ebuild
similarity index 93%
rename from chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r2756.ebuild
rename to chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r2757.ebuild
index 3ea8858..a7a899e 100644
--- a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r2756.ebuild
+++ b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r2757.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("0ba3e1d4fba6f8db0a52cd7cd0d1b708eefb1452" "0eef4c5574a033a5584a0711d332b41e01ab50c2" "bfa3b34f638375b505004095ea3e7a60b3cc7788" "8eb6edf6e05c2328605ad351da806fa37cefc068" "1e70180175e02fe2465b7c676d862f6cc6e88529")
-CROS_WORKON_TREE=("ad801ffd521c4f622dca3b192b539d92238a3394" "b179ccd74d7d387aea458358f205107cb12fddd9" "0806a13ff4dc41aca5ba34176c1b41611c195645" "bea004e95973d9e20bbeb07189966519fc74e8e4" "c491e0df4734366a1e73f5ba960c7d396bc3d72e")
+CROS_WORKON_COMMIT=("0ba3e1d4fba6f8db0a52cd7cd0d1b708eefb1452" "0eef4c5574a033a5584a0711d332b41e01ab50c2" "bfa3b34f638375b505004095ea3e7a60b3cc7788" "8eb6edf6e05c2328605ad351da806fa37cefc068" "acaf450e8a3692b897605c2b5e4a0a2130b581fb")
+CROS_WORKON_TREE=("ad801ffd521c4f622dca3b192b539d92238a3394" "b179ccd74d7d387aea458358f205107cb12fddd9" "0806a13ff4dc41aca5ba34176c1b41611c195645" "bea004e95973d9e20bbeb07189966519fc74e8e4" "93b1311f87d5a657b4e1f7d5406c477345293598")
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/zephyr"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r10166.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r10167.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r10166.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r10167.ebuild
index 7deed1d..18a8432 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r10166.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r10167.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="1e70180175e02fe2465b7c676d862f6cc6e88529"
-CROS_WORKON_TREE="c491e0df4734366a1e73f5ba960c7d396bc3d72e"
+CROS_WORKON_COMMIT="acaf450e8a3692b897605c2b5e4a0a2130b581fb"
+CROS_WORKON_TREE="93b1311f87d5a657b4e1f7d5406c477345293598"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 PYTHON_COMPAT=( python3_6 )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r9272.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r9273.ebuild
similarity index 89%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r9272.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r9273.ebuild
index 5c3bd72..dbb66ff 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r9272.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r9273.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="1e70180175e02fe2465b7c676d862f6cc6e88529"
-CROS_WORKON_TREE="c491e0df4734366a1e73f5ba960c7d396bc3d72e"
+CROS_WORKON_COMMIT="acaf450e8a3692b897605c2b5e4a0a2130b581fb"
+CROS_WORKON_TREE="93b1311f87d5a657b4e1f7d5406c477345293598"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ec-utils/ec-utils-0.0.2-r12100.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r12101.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r12100.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r12101.ebuild
index 2e4a701..944f3e8 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r12100.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r12101.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="1e70180175e02fe2465b7c676d862f6cc6e88529"
-CROS_WORKON_TREE="c491e0df4734366a1e73f5ba960c7d396bc3d72e"
+CROS_WORKON_COMMIT="acaf450e8a3692b897605c2b5e4a0a2130b581fb"
+CROS_WORKON_TREE="93b1311f87d5a657b4e1f7d5406c477345293598"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/shill-client/shill-client-0.0.1-r2924.ebuild b/chromeos-base/shill-client/shill-client-0.0.1-r2925.ebuild
similarity index 80%
rename from chromeos-base/shill-client/shill-client-0.0.1-r2924.ebuild
rename to chromeos-base/shill-client/shill-client-0.0.1-r2925.ebuild
index 8101901..c88b693 100644
--- a/chromeos-base/shill-client/shill-client-0.0.1-r2924.ebuild
+++ b/chromeos-base/shill-client/shill-client-0.0.1-r2925.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0552743f999c770785119b0e241749a91f8873a1"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "4f845f48dc2ae05a931fce4709cd553e5a21981e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="445eb07a22d40b1ddb9e83982b5f4651b42763fe"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "af34df3cead984a15c3f519e450e173d33847dff" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r697.ebuild b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r698.ebuild
similarity index 85%
rename from chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r697.ebuild
rename to chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r698.ebuild
index c4aea39d..f49df3d 100644
--- a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r697.ebuild
+++ b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r698.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0552743f999c770785119b0e241749a91f8873a1"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "4f845f48dc2ae05a931fce4709cd553e5a21981e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="445eb07a22d40b1ddb9e83982b5f4651b42763fe"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "af34df3cead984a15c3f519e450e173d33847dff" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/shill-net/shill-net-0.0.1-r773.ebuild b/chromeos-base/shill-net/shill-net-0.0.1-r774.ebuild
similarity index 90%
rename from chromeos-base/shill-net/shill-net-0.0.1-r773.ebuild
rename to chromeos-base/shill-net/shill-net-0.0.1-r774.ebuild
index ced2e59..fb9fdb5 100644
--- a/chromeos-base/shill-net/shill-net-0.0.1-r773.ebuild
+++ b/chromeos-base/shill-net/shill-net-0.0.1-r774.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0552743f999c770785119b0e241749a91f8873a1"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "4f845f48dc2ae05a931fce4709cd553e5a21981e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="445eb07a22d40b1ddb9e83982b5f4651b42763fe"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "af34df3cead984a15c3f519e450e173d33847dff" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/shill/shill-0.0.5-r3101.ebuild b/chromeos-base/shill/shill-0.0.5-r3102.ebuild
similarity index 97%
rename from chromeos-base/shill/shill-0.0.5-r3101.ebuild
rename to chromeos-base/shill/shill-0.0.5-r3102.ebuild
index dfcf442..42b9f91 100644
--- a/chromeos-base/shill/shill-0.0.5-r3101.ebuild
+++ b/chromeos-base/shill/shill-0.0.5-r3102.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0552743f999c770785119b0e241749a91f8873a1"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "b8893a9e8fdf8b402519c4496addb087f21fbe50" "56dc9b3a788bc68f829c1e7a1d3b6cf067c7aaf9" "4a0dedab080195bdc122d2289118df4af3ddca2c" "4f845f48dc2ae05a931fce4709cd553e5a21981e" "b77be93bd5b9a461cc8508aa57571afd308e97ce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="445eb07a22d40b1ddb9e83982b5f4651b42763fe"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "b8893a9e8fdf8b402519c4496addb087f21fbe50" "56dc9b3a788bc68f829c1e7a1d3b6cf067c7aaf9" "4a0dedab080195bdc122d2289118df4af3ddca2c" "af34df3cead984a15c3f519e450e173d33847dff" "b77be93bd5b9a461cc8508aa57571afd308e97ce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9577.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9578.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9577.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9578.ebuild
index 8a21cfb..8e502e8 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9577.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9578.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("6a99a4ca16ebf2fc137740a670af6f3e250200cf" "9e62f787bdb066d6f6d187ba4c5614e81a2289c7")
-CROS_WORKON_TREE=("b79b322be8b2d6714fdbea883a4d430ece391555" "22dce69eb9b87f1074930ff8ca5592eb2312c7da")
+CROS_WORKON_COMMIT=("e230ec11fcae92e25c6904d7b68e7ece28456694" "9e62f787bdb066d6f6d187ba4c5614e81a2289c7")
+CROS_WORKON_TREE=("c89be71413fe62bd9560633e7ca23303034f1cd9" "22dce69eb9b87f1074930ff8ca5592eb2312c7da")
 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.2-r9662.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9663.ebuild
similarity index 91%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9662.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9663.ebuild
index 6c32650..b434da8 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9662.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9663.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("6a99a4ca16ebf2fc137740a670af6f3e250200cf" "9e62f787bdb066d6f6d187ba4c5614e81a2289c7" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
-CROS_WORKON_TREE=("b79b322be8b2d6714fdbea883a4d430ece391555" "22dce69eb9b87f1074930ff8ca5592eb2312c7da" "dad0497090bce4480ce6b88ada1f4187c960ccf2")
+CROS_WORKON_COMMIT=("e230ec11fcae92e25c6904d7b68e7ece28456694" "9e62f787bdb066d6f6d187ba4c5614e81a2289c7" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
+CROS_WORKON_TREE=("c89be71413fe62bd9560633e7ca23303034f1cd9" "22dce69eb9b87f1074930ff8ca5592eb2312c7da" "dad0497090bce4480ce6b88ada1f4187c960ccf2")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1995.ebuild b/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1996.ebuild
similarity index 85%
rename from chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1995.ebuild
rename to chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1996.ebuild
index 2c5a32c..70d3421 100644
--- a/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1995.ebuild
+++ b/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1996.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="6a99a4ca16ebf2fc137740a670af6f3e250200cf"
-CROS_WORKON_TREE="733edc5b78d17b97220697c2e4fed9ea2a644cb8"
+CROS_WORKON_COMMIT="e230ec11fcae92e25c6904d7b68e7ece28456694"
+CROS_WORKON_TREE="7809c1acdbf314808090f155e31c00d36d5ee6c0"
 CROS_WORKON_PROJECT=("chromiumos/platform/tast-tests")
 CROS_WORKON_LOCALNAME=("platform/tast-tests")
 CROS_WORKON_DESTDIR=("${S}")
diff --git a/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2255.ebuild b/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2256.ebuild
similarity index 90%
rename from chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2255.ebuild
rename to chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2256.ebuild
index 0d5bc03..5d806b9 100644
--- a/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2255.ebuild
+++ b/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2256.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("6a99a4ca16ebf2fc137740a670af6f3e250200cf" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
-CROS_WORKON_TREE="6f9f2b39e2eee6dd78331ef4ba6b03690b5257c8"
+CROS_WORKON_COMMIT=("e230ec11fcae92e25c6904d7b68e7ece28456694" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
+CROS_WORKON_TREE="aa83f62b61db62de7228d7b2452c4895236ae23f"
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6116.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6117.ebuild
similarity index 82%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6116.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6117.ebuild
index b73535f..f41f1f4 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6116.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6117.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="eb2c7a1ed529de6e3ec91a32a5b45820f4ee2b81"
-CROS_WORKON_TREE="892f23b1417ad8574ed3217510b5b05bef84ec02"
+CROS_WORKON_COMMIT="60ac81314efc8b9afa57bfed98402b9250a51128"
+CROS_WORKON_TREE="72d10c78adcc6d635f7cb9fff4b87ac70c16a7b2"
 PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"