diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6761.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6762.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6761.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6762.ebuild
index bdf34f3..5b8b94e 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6761.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6762.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r9550.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9551.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9550.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9551.ebuild
index 3bb069a..7aa3c5f 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9550.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9551.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r5434.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5435.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5434.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5435.ebuild
index 273b329..9b4d245 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5434.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r5435.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r9921.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9922.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9921.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9922.ebuild
index 08cba79..800621f 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9921.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9922.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r9901.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9902.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9901.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9902.ebuild
index 6ceb57f..15c4c54 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9901.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9902.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r9513.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9514.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9513.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9514.ebuild
index f2573d1..50f66e0 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9513.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9514.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r5510.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5511.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5510.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5511.ebuild
index 377c6d8..3aa9986 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5510.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5511.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r10523.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10524.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10523.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10524.ebuild
index babbd0c..827d06b 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10523.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10524.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r10073.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10074.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10073.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10074.ebuild
index 814a570..5e90b23 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10073.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r10074.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r14741.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r14742.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r14741.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r14742.ebuild
index 78a68b8..9e8ec7c 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r14741.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r14742.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r2458.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2459.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2458.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2459.ebuild
index 8c6e350..d3229da5 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2458.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2459.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 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-r3096.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3097.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3096.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3097.ebuild
index 75de029..8ad310d 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3096.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r3097.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r14884.ebuild b/chromeos-base/autotest/autotest-0.0.2-r14885.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r14884.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r14885.ebuild
index 868bfd4..705badf 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r14884.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r14885.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("13f273925ec73c8e42830215c4e9343d1e298188" "50826c369fecc61e5699beae61298aaaa9f009ce" "72df0f2b89ecca6d2f823038c6422fe5b898a0fb")
-CROS_WORKON_TREE=("07b8eb0ebd42cb09956a05971d575cacdf338c0b" "84d973277d83c07b96298eabb5025c1241aa7dd1" "3f2804fd986e4f3dabfe8baa51297be1f057f7d3")
+CROS_WORKON_COMMIT=("909f58cf6010e11d37caad4e3e1de69c4064b251" "50826c369fecc61e5699beae61298aaaa9f009ce" "72df0f2b89ecca6d2f823038c6422fe5b898a0fb")
+CROS_WORKON_TREE=("673c2aba9ae1ce95a46c49852fff7f59511841e5" "84d973277d83c07b96298eabb5025c1241aa7dd1" "3f2804fd986e4f3dabfe8baa51297be1f057f7d3")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/config"
diff --git a/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r310.ebuild b/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r311.ebuild
similarity index 97%
rename from chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r310.ebuild
rename to chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r311.ebuild
index 6411b79..93e9b7c 100644
--- a/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r310.ebuild
+++ b/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r311.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("29c152bcf67e09d60d28f519458b7fd7a0e8a1cd" "89e0c94916b4874f72074c40521f67e3ca90e42d" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("3cee0b187a5827da26a23ea25d300d23982130ae" "2159375e60a21a4f4cd6da052dcc95a4a0dec15d" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("307b3dc3c0a294d2245ea7e9475f548077a98c3b" "89e0c94916b4874f72074c40521f67e3ca90e42d" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("000a9abf9b613e3f9508d244a0310108069d04ad" "2159375e60a21a4f4cd6da052dcc95a4a0dec15d" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/tpm2"
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r6416.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r6417.ebuild
similarity index 89%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r6416.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r6417.ebuild
index 1b5788b..a6d64c9d 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r6416.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r6417.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("41ee17ad17806fc742a9622341d34b0f0fe5c80d" "29c152bcf67e09d60d28f519458b7fd7a0e8a1cd")
-CROS_WORKON_TREE=("4211779d15bde871d051b94a1d7e6dd6ed1aa8f1" "3cee0b187a5827da26a23ea25d300d23982130ae")
+CROS_WORKON_COMMIT=("41ee17ad17806fc742a9622341d34b0f0fe5c80d" "307b3dc3c0a294d2245ea7e9475f548077a98c3b")
+CROS_WORKON_TREE=("4211779d15bde871d051b94a1d7e6dd6ed1aa8f1" "000a9abf9b613e3f9508d244a0310108069d04ad")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r7947.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r7948.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r7947.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r7948.ebuild
index 8849634..1213b9e 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r7947.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r7948.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("21530be3e2cd15544ea8797d5db5a0efd438af46" "b1fb85673bd75c54dae214fc3d7764672916819d")
-CROS_WORKON_TREE=("3a5a5d1fc565e3145e96c03772d2c30e8f82fed2" "4ddc1331cc37b407523e4c42a01d9d6cdbe6d9eb")
+CROS_WORKON_COMMIT=("3b076152f3e7f4521c3237cf3680ad22a603aa55" "b1fb85673bd75c54dae214fc3d7764672916819d")
+CROS_WORKON_TREE=("e07b21737e42e3780e72fea0c67923eb39655d0d" "4ddc1331cc37b407523e4c42a01d9d6cdbe6d9eb")
 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-r8019.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r8020.ebuild
similarity index 91%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r8019.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r8020.ebuild
index 2a4f23d..8a36a86 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r8019.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r8020.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("21530be3e2cd15544ea8797d5db5a0efd438af46" "b1fb85673bd75c54dae214fc3d7764672916819d" "72df0f2b89ecca6d2f823038c6422fe5b898a0fb")
-CROS_WORKON_TREE=("3a5a5d1fc565e3145e96c03772d2c30e8f82fed2" "4ddc1331cc37b407523e4c42a01d9d6cdbe6d9eb" "3f2804fd986e4f3dabfe8baa51297be1f057f7d3")
+CROS_WORKON_COMMIT=("3b076152f3e7f4521c3237cf3680ad22a603aa55" "b1fb85673bd75c54dae214fc3d7764672916819d" "72df0f2b89ecca6d2f823038c6422fe5b898a0fb")
+CROS_WORKON_TREE=("e07b21737e42e3780e72fea0c67923eb39655d0d" "4ddc1331cc37b407523e4c42a01d9d6cdbe6d9eb" "3f2804fd986e4f3dabfe8baa51297be1f057f7d3")
 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-r667.ebuild b/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r668.ebuild
similarity index 85%
rename from chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r667.ebuild
rename to chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r668.ebuild
index 8eb57f7..a315bab 100644
--- a/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r667.ebuild
+++ b/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r668.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="21530be3e2cd15544ea8797d5db5a0efd438af46"
-CROS_WORKON_TREE="a1dcd16c8a962476d0bfb7bdbeac2c8fc638c1b0"
+CROS_WORKON_COMMIT="3b076152f3e7f4521c3237cf3680ad22a603aa55"
+CROS_WORKON_TREE="700a89380f0b8273422221c5aee010a4c2149157"
 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-r745.ebuild b/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r746.ebuild
similarity index 89%
rename from chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r745.ebuild
rename to chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r746.ebuild
index a32f41a..9c88597 100644
--- a/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r745.ebuild
+++ b/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r746.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("21530be3e2cd15544ea8797d5db5a0efd438af46" "72df0f2b89ecca6d2f823038c6422fe5b898a0fb")
-CROS_WORKON_TREE="d39de2368a647ab9f1ea3134cf92954b500d3164"
+CROS_WORKON_COMMIT=("3b076152f3e7f4521c3237cf3680ad22a603aa55" "72df0f2b89ecca6d2f823038c6422fe5b898a0fb")
+CROS_WORKON_TREE="dd80faadade35ff00dfbcd2742fb9bef7cf4d83f"
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5593.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5594.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5593.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5594.ebuild
index 9f90a2d..d4c7da1 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5593.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5594.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="13f273925ec73c8e42830215c4e9343d1e298188"
-CROS_WORKON_TREE="07b8eb0ebd42cb09956a05971d575cacdf338c0b"
+CROS_WORKON_COMMIT="909f58cf6010e11d37caad4e3e1de69c4064b251"
+CROS_WORKON_TREE="673c2aba9ae1ce95a46c49852fff7f59511841e5"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/sys-boot/depthcharge/depthcharge-0.0.1-r3452.ebuild b/sys-boot/depthcharge/depthcharge-0.0.1-r3453.ebuild
similarity index 97%
rename from sys-boot/depthcharge/depthcharge-0.0.1-r3452.ebuild
rename to sys-boot/depthcharge/depthcharge-0.0.1-r3453.ebuild
index 140ddec..68e59af 100644
--- a/sys-boot/depthcharge/depthcharge-0.0.1-r3452.ebuild
+++ b/sys-boot/depthcharge/depthcharge-0.0.1-r3453.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("83297e92d78122eb3397d4c7ad947fe4f520acb1" "1269365169791c65a6bf6f364583209195874138")
-CROS_WORKON_TREE=("85485b2b8b011eff636c4ad12f2872db6845e4bc" "63abdfe41a1746dfd5452f030b2ff4646a15ff76")
+CROS_WORKON_COMMIT=("38a1b13da9d2838fe5e303239528965ec173a9f0" "1269365169791c65a6bf6f364583209195874138")
+CROS_WORKON_TREE=("d3d1417229734b694fbf97adaf1a8ea5788e6b41" "63abdfe41a1746dfd5452f030b2ff4646a15ff76")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/depthcharge"
 	"chromiumos/platform/vboot_reference"