diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5368.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5369.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5368.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5369.ebuild
index 577cecf..7d4df0f 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5368.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5369.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r8157.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8158.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8157.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8158.ebuild
index 1251690..785e38d 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8157.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8158.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r4041.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4042.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4041.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4042.ebuild
index 31141a17a..1fa7207 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4041.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4042.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r8528.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8529.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8528.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8529.ebuild
index 49c0bf8..6283c41 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8528.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8529.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r8508.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8509.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8508.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8509.ebuild
index 6eb68c4..b792291 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8508.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8509.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r8120.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8121.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8120.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8121.ebuild
index d048a6a..8219954 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8120.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8121.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r12771.ebuild b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12772.ebuild
similarity index 90%
rename from chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12771.ebuild
rename to chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12772.ebuild
index af52862..343b49b 100644
--- a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12771.ebuild
+++ b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12772.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r4117.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4118.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4117.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4118.ebuild
index c5914eb..0b5dc4e 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4117.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4118.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r9130.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9131.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9130.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9131.ebuild
index fba8757..6cb23f1 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9130.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9131.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r8680.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8681.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8680.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8681.ebuild
index 9749938..2ffaee8 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8680.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8681.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r13347.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13348.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r13347.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r13348.ebuild
index 61db456..3666d6b 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13347.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13348.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r1065.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1066.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1065.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1066.ebuild
index f0e63b2..bc7d3a0 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1065.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1066.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 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-r1703.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1704.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1703.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1704.ebuild
index 1c61c3f..1714999 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1703.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1704.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r13381.ebuild b/chromeos-base/autotest/autotest-0.0.2-r13382.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r13381.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r13382.ebuild
index 361b858..0aba4b5 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r13381.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r13382.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("fe8229c3d16eba57d5cae97dc50b115f3b39a544" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
-CROS_WORKON_TREE=("e5642cac019e922086622446b9d1208112cef85e" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
+CROS_WORKON_COMMIT=("1a83f136a412c3253e96ec04be5014f3f72ec886" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
+CROS_WORKON_TREE=("6a295be6fc085ba6a30854be566eff08e23435e2" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4200.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4201.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4200.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4201.ebuild
index 3c5f5276..7c8db47 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4200.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4201.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fe8229c3d16eba57d5cae97dc50b115f3b39a544"
-CROS_WORKON_TREE="e5642cac019e922086622446b9d1208112cef85e"
+CROS_WORKON_COMMIT="1a83f136a412c3253e96ec04be5014f3f72ec886"
+CROS_WORKON_TREE="6a295be6fc085ba6a30854be566eff08e23435e2"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1756.ebuild b/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1757.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1756.ebuild
rename to sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1757.ebuild
index ca09bb9..62a81fa 100644
--- a/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1756.ebuild
+++ b/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1757.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="959853de5c37d863d407dca3f0cda2aed01885ed"
-CROS_WORKON_TREE="c268c1efadd8a4e79b68a98fdc1dd0e2fd38dd3a"
+CROS_WORKON_COMMIT="1b933bb9d40b6836c022424418d5a59e2b6daada"
+CROS_WORKON_TREE="14e8a0ee5b3797da124fb74ff7cf4894e0cdece3"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v4.19"
 CROS_WORKON_EGIT_BRANCH="chromeos-4.19"