diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5253.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5254.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5253.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5254.ebuild
index 8968a5b..f20a45a 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5253.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5254.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r8042.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8043.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8042.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8043.ebuild
index 227d6d2..5069bc4 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8042.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8043.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r3926.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3927.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3926.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3927.ebuild
index dc377fd..13cc299 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3926.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3927.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r8413.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8414.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8413.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8414.ebuild
index d69a3b4..807ef5f 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8413.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8414.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r8393.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8394.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8393.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8394.ebuild
index c291d58..b922b4c 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8393.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8394.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r8005.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8006.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8005.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8006.ebuild
index 69b63cc..1775e1b 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8005.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8006.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r12656.ebuild b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12657.ebuild
similarity index 90%
rename from chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12656.ebuild
rename to chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12657.ebuild
index c2ff804..65417c6 100644
--- a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12656.ebuild
+++ b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12657.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r4002.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4003.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4002.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4003.ebuild
index 698fcce..9be22e6 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4002.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4003.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r9015.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9016.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9015.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9016.ebuild
index 1b7ab07..0155330 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9015.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9016.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r8565.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8566.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8565.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8566.ebuild
index b0aaa76..9c11599 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8565.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8566.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r13232.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13233.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r13232.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r13233.ebuild
index ef014ac..3219f6c 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13232.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13233.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r950.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r951.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r950.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r951.ebuild
index 75f152e..2796aa9 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r950.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r951.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 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-r1588.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1589.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1588.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1589.ebuild
index 25766c8..5d5b084 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1588.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1589.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r13263.ebuild b/chromeos-base/autotest/autotest-0.0.2-r13264.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r13263.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r13264.ebuild
index 0a6cd1f..5914bb1 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r13263.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r13264.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("168323a8177eb1263695f3dcd6546b2bf5c73748" "64fdc2e92c788aee1ecdb3ea7a6663d81e45f133")
-CROS_WORKON_TREE=("a14ada29cc5c7acbe1cd69715948c5911bcb4c15" "ead2d6249503205e67567c3df345990d13d48326")
+CROS_WORKON_COMMIT=("8b8a579be8895b77bfc27393cee006ffff8097a0" "64fdc2e92c788aee1ecdb3ea7a6663d81e45f133")
+CROS_WORKON_TREE=("fde327e987c05385058574524edf9351533bf264" "ead2d6249503205e67567c3df345990d13d48326")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4538.ebuild b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4539.ebuild
similarity index 95%
rename from chromeos-base/chromeos-login/chromeos-login-0.0.2-r4538.ebuild
rename to chromeos-base/chromeos-login/chromeos-login-0.0.2-r4539.ebuild
index 6363bf3..696ae77 100644
--- a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4538.ebuild
+++ b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4539.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="598df2d36f7ff61bd52efbe0382d6765de4196a3"
-CROS_WORKON_TREE=("f86b3dad942180ce041d9034a4f5f9cceb8afe6b" "f362827ede8713fe521f7b0af5dfdbed5627c34f" "505c8e422e92b847cbbe69b472f137baac005cc9" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "5f865b2042e20c3903873f648b5f41399044c29b" "41e588aa09391b289425ae58c40be138298c6cb0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="12ee02677967ba93a6f4c13b5253957a442ea4ec"
+CROS_WORKON_TREE=("f86b3dad942180ce041d9034a4f5f9cceb8afe6b" "f362827ede8713fe521f7b0af5dfdbed5627c34f" "505c8e422e92b847cbbe69b472f137baac005cc9" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "a031f3d59b0cd84ce69bcdb624f6d6fdde30516d" "41e588aa09391b289425ae58c40be138298c6cb0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/factory-mini/factory-mini-0.0.1-r1977.ebuild b/chromeos-base/factory-mini/factory-mini-0.0.1-r1978.ebuild
similarity index 95%
rename from chromeos-base/factory-mini/factory-mini-0.0.1-r1977.ebuild
rename to chromeos-base/factory-mini/factory-mini-0.0.1-r1978.ebuild
index 51331c1..95e9498 100644
--- a/chromeos-base/factory-mini/factory-mini-0.0.1-r1977.ebuild
+++ b/chromeos-base/factory-mini/factory-mini-0.0.1-r1978.ebuild
@@ -15,8 +15,8 @@
 # from /usr/local/bin to that file.
 
 EAPI=7
-CROS_WORKON_COMMIT="c0a25f5f2bb9fa813930736c2dcfe6f533bdceb2"
-CROS_WORKON_TREE="5126cbf11271ea06d7a2f65a3a59a272573439c0"
+CROS_WORKON_COMMIT="e20b5d9e59ff33906962095ea1f76a68ba2c327d"
+CROS_WORKON_TREE="7355df0edb67c17d4f713921dd057aae972bd7d5"
 CROS_WORKON_PROJECT="chromiumos/platform/factory"
 CROS_WORKON_LOCALNAME="platform/factory"
 PYTHON_COMPAT=( python3_{4,5,6,7} )
diff --git a/chromeos-base/factory/factory-0.2.0-r1906.ebuild b/chromeos-base/factory/factory-0.2.0-r1907.ebuild
similarity index 93%
rename from chromeos-base/factory/factory-0.2.0-r1906.ebuild
rename to chromeos-base/factory/factory-0.2.0-r1907.ebuild
index 0f1994a..f970455 100644
--- a/chromeos-base/factory/factory-0.2.0-r1906.ebuild
+++ b/chromeos-base/factory/factory-0.2.0-r1907.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="c0a25f5f2bb9fa813930736c2dcfe6f533bdceb2"
-CROS_WORKON_TREE="5126cbf11271ea06d7a2f65a3a59a272573439c0"
+CROS_WORKON_COMMIT="e20b5d9e59ff33906962095ea1f76a68ba2c327d"
+CROS_WORKON_TREE="7355df0edb67c17d4f713921dd057aae972bd7d5"
 CROS_WORKON_PROJECT="chromiumos/platform/factory"
 CROS_WORKON_LOCALNAME="platform/factory"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2049.ebuild b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2050.ebuild
similarity index 85%
rename from chromeos-base/session_manager-client/session_manager-client-0.0.1-r2049.ebuild
rename to chromeos-base/session_manager-client/session_manager-client-0.0.1-r2050.ebuild
index cdef69b..3f95ab8 100644
--- a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2049.ebuild
+++ b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2050.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="598df2d36f7ff61bd52efbe0382d6765de4196a3"
-CROS_WORKON_TREE=("f86b3dad942180ce041d9034a4f5f9cceb8afe6b" "5f865b2042e20c3903873f648b5f41399044c29b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="12ee02677967ba93a6f4c13b5253957a442ea4ec"
+CROS_WORKON_TREE=("f86b3dad942180ce041d9034a4f5f9cceb8afe6b" "a031f3d59b0cd84ce69bcdb624f6d6fdde30516d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r875.ebuild b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r876.ebuild
similarity index 90%
rename from chromeos-base/tast-cmd/tast-cmd-0.0.1-r875.ebuild
rename to chromeos-base/tast-cmd/tast-cmd-0.0.1-r876.ebuild
index 9728fa3..1323a2e 100644
--- a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r875.ebuild
+++ b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r876.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b83cd3afcd9c6ff9f82e3cf2243ee19f21921e6d"
-CROS_WORKON_TREE="e04e0364fb6e0ca99d4c0a06af36dd5dec1c865d"
+CROS_WORKON_COMMIT="8383d64e268b7cdb7663f8293212d9a7b5d63ec3"
+CROS_WORKON_TREE="45280497bc730bc88c4f1d70eb4e5e6bfdf824b7"
 CROS_WORKON_PROJECT="chromiumos/platform/tast"
 CROS_WORKON_LOCALNAME="platform/tast"
 
diff --git a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r826.ebuild b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r827.ebuild
similarity index 88%
rename from chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r826.ebuild
rename to chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r827.ebuild
index 97746b0..2aa5fed 100644
--- a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r826.ebuild
+++ b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r827.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b83cd3afcd9c6ff9f82e3cf2243ee19f21921e6d"
-CROS_WORKON_TREE="e04e0364fb6e0ca99d4c0a06af36dd5dec1c865d"
+CROS_WORKON_COMMIT="8383d64e268b7cdb7663f8293212d9a7b5d63ec3"
+CROS_WORKON_TREE="45280497bc730bc88c4f1d70eb4e5e6bfdf824b7"
 CROS_WORKON_PROJECT="chromiumos/platform/tast"
 CROS_WORKON_LOCALNAME="platform/tast"
 
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4481.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4482.ebuild
similarity index 86%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4481.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4482.ebuild
index 3f06136..3bd999d 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4481.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4482.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("5f1c2110a7616475d9910fa9183d95c18c2098e3" "b83cd3afcd9c6ff9f82e3cf2243ee19f21921e6d")
-CROS_WORKON_TREE=("7ed0ac8776e9fc2679a8584b0809d587a9445543" "e04e0364fb6e0ca99d4c0a06af36dd5dec1c865d")
+CROS_WORKON_COMMIT=("3cf29370604f661cf7b839bb8da3d69c71e49ce4" "8383d64e268b7cdb7663f8293212d9a7b5d63ec3")
+CROS_WORKON_TREE=("6b12c6e76a4dbea7a74019633b758d9a0f6946ae" "45280497bc730bc88c4f1d70eb4e5e6bfdf824b7")
 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.1-r4512.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4513.ebuild
similarity index 81%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4512.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4513.ebuild
index 3546981..d6c78b2 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4512.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4513.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("5f1c2110a7616475d9910fa9183d95c18c2098e3" "b83cd3afcd9c6ff9f82e3cf2243ee19f21921e6d" "64fdc2e92c788aee1ecdb3ea7a6663d81e45f133")
-CROS_WORKON_TREE=("7ed0ac8776e9fc2679a8584b0809d587a9445543" "e04e0364fb6e0ca99d4c0a06af36dd5dec1c865d" "ead2d6249503205e67567c3df345990d13d48326")
+CROS_WORKON_COMMIT=("3cf29370604f661cf7b839bb8da3d69c71e49ce4" "8383d64e268b7cdb7663f8293212d9a7b5d63ec3" "64fdc2e92c788aee1ecdb3ea7a6663d81e45f133")
+CROS_WORKON_TREE=("6b12c6e76a4dbea7a74019633b758d9a0f6946ae" "45280497bc730bc88c4f1d70eb4e5e6bfdf824b7" "ead2d6249503205e67567c3df345990d13d48326")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4085.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4086.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4085.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4086.ebuild
index 56ad03a..1210980 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4085.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4086.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="168323a8177eb1263695f3dcd6546b2bf5c73748"
-CROS_WORKON_TREE="a14ada29cc5c7acbe1cd69715948c5911bcb4c15"
+CROS_WORKON_COMMIT="8b8a579be8895b77bfc27393cee006ffff8097a0"
+CROS_WORKON_TREE="fde327e987c05385058574524edf9351533bf264"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4610.ebuild b/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4611.ebuild
similarity index 93%
rename from sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4610.ebuild
rename to sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4611.ebuild
index 6be45f3..97a671d 100644
--- a/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4610.ebuild
+++ b/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4611.ebuild
@@ -3,8 +3,8 @@
 # $Header:
 
 EAPI=7
-CROS_WORKON_COMMIT=("b55ef9909516cce8de69bc98efabdf3e7093b550" "48195e5878006ac2cf74cb7f02953ab06c68202d")
-CROS_WORKON_TREE=("380ac7c19123addc2da0451b2379fd6bac849cc3" "ddda0f1d52d04ddbee29b82261214718bbfd9b88")
+CROS_WORKON_COMMIT=("5347a1acf63bf2a4e1481d8e2d691b6ceab85204" "48195e5878006ac2cf74cb7f02953ab06c68202d")
+CROS_WORKON_TREE=("b1c9eaca9c8b61b6365ccd947c153de5e7d53ea6" "ddda0f1d52d04ddbee29b82261214718bbfd9b88")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/coreboot"
 	"chromiumos/platform/vboot_reference"
diff --git a/sys-apps/superiotool/superiotool-0.0.1-r2895.ebuild b/sys-apps/superiotool/superiotool-0.0.1-r2896.ebuild
similarity index 84%
rename from sys-apps/superiotool/superiotool-0.0.1-r2895.ebuild
rename to sys-apps/superiotool/superiotool-0.0.1-r2896.ebuild
index 8da5288..6ee9658 100644
--- a/sys-apps/superiotool/superiotool-0.0.1-r2895.ebuild
+++ b/sys-apps/superiotool/superiotool-0.0.1-r2896.ebuild
@@ -3,8 +3,8 @@
 # $Header: $
 
 EAPI=4
-CROS_WORKON_COMMIT="b55ef9909516cce8de69bc98efabdf3e7093b550"
-CROS_WORKON_TREE="380ac7c19123addc2da0451b2379fd6bac849cc3"
+CROS_WORKON_COMMIT="5347a1acf63bf2a4e1481d8e2d691b6ceab85204"
+CROS_WORKON_TREE="b1c9eaca9c8b61b6365ccd947c153de5e7d53ea6"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 CROS_WORKON_LOCALNAME="coreboot"
 
diff --git a/sys-boot/coreboot/coreboot-0.0.1-r4066.ebuild b/sys-boot/coreboot/coreboot-0.0.1-r4067.ebuild
similarity index 98%
rename from sys-boot/coreboot/coreboot-0.0.1-r4066.ebuild
rename to sys-boot/coreboot/coreboot-0.0.1-r4067.ebuild
index ca261a5..0c48d00 100644
--- a/sys-boot/coreboot/coreboot-0.0.1-r4066.ebuild
+++ b/sys-boot/coreboot/coreboot-0.0.1-r4067.ebuild
@@ -6,8 +6,8 @@
 # VERSION=REVBUMP-0.0.66
 
 EAPI=7
-CROS_WORKON_COMMIT=("b55ef9909516cce8de69bc98efabdf3e7093b550" "943aff0c16434d558d3e1f5744d6119b49970504" "48195e5878006ac2cf74cb7f02953ab06c68202d" "539d31ab9ea89084fa5edf7cc9ac3122786d5454" "5db30f4ce465a8814d48bebd17b62280a0b9c723" "ee319ae7bc59e88b60142f40a9ec1b46656de4db" "b7d5b2d6a6dd05874d86ee900ff441d261f9034c")
-CROS_WORKON_TREE=("380ac7c19123addc2da0451b2379fd6bac849cc3" "e58b88828fa7d1946361c9ef45f9f1128cf92c89" "ddda0f1d52d04ddbee29b82261214718bbfd9b88" "3155925d35f57041703913dde70f8eebf96d79df" "b4f4f68a2e4fc8028367becf76b734d0a86483fa" "45d22a8711f85c4310c0c2121d3dc8a72793d375" "c0433b88f972fa26dded401be022c1c026cd644e")
+CROS_WORKON_COMMIT=("5347a1acf63bf2a4e1481d8e2d691b6ceab85204" "943aff0c16434d558d3e1f5744d6119b49970504" "48195e5878006ac2cf74cb7f02953ab06c68202d" "539d31ab9ea89084fa5edf7cc9ac3122786d5454" "5db30f4ce465a8814d48bebd17b62280a0b9c723" "ee319ae7bc59e88b60142f40a9ec1b46656de4db" "b7d5b2d6a6dd05874d86ee900ff441d261f9034c")
+CROS_WORKON_TREE=("b1c9eaca9c8b61b6365ccd947c153de5e7d53ea6" "e58b88828fa7d1946361c9ef45f9f1128cf92c89" "ddda0f1d52d04ddbee29b82261214718bbfd9b88" "3155925d35f57041703913dde70f8eebf96d79df" "b4f4f68a2e4fc8028367becf76b734d0a86483fa" "45d22a8711f85c4310c0c2121d3dc8a72793d375" "c0433b88f972fa26dded401be022c1c026cd644e")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/coreboot"
 	"chromiumos/third_party/arm-trusted-firmware"
diff --git a/sys-boot/coreinfo/coreinfo-0.0.1-r3877.ebuild b/sys-boot/coreinfo/coreinfo-0.0.1-r3878.ebuild
similarity index 89%
rename from sys-boot/coreinfo/coreinfo-0.0.1-r3877.ebuild
rename to sys-boot/coreinfo/coreinfo-0.0.1-r3878.ebuild
index 36f0c9c..2004813 100644
--- a/sys-boot/coreinfo/coreinfo-0.0.1-r3877.ebuild
+++ b/sys-boot/coreinfo/coreinfo-0.0.1-r3878.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b55ef9909516cce8de69bc98efabdf3e7093b550"
-CROS_WORKON_TREE="380ac7c19123addc2da0451b2379fd6bac849cc3"
+CROS_WORKON_COMMIT="5347a1acf63bf2a4e1481d8e2d691b6ceab85204"
+CROS_WORKON_TREE="b1c9eaca9c8b61b6365ccd947c153de5e7d53ea6"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 
 DESCRIPTION="coreboot's coreinfo payload"
diff --git a/sys-boot/libpayload/libpayload-0.0.1-r3944.ebuild b/sys-boot/libpayload/libpayload-0.0.1-r3945.ebuild
similarity index 95%
rename from sys-boot/libpayload/libpayload-0.0.1-r3944.ebuild
rename to sys-boot/libpayload/libpayload-0.0.1-r3945.ebuild
index 1300839..d7b6587 100644
--- a/sys-boot/libpayload/libpayload-0.0.1-r3944.ebuild
+++ b/sys-boot/libpayload/libpayload-0.0.1-r3945.ebuild
@@ -6,8 +6,8 @@
 # VERSION=REVBUMP-0.0.17
 
 EAPI=7
-CROS_WORKON_COMMIT="b55ef9909516cce8de69bc98efabdf3e7093b550"
-CROS_WORKON_TREE="380ac7c19123addc2da0451b2379fd6bac849cc3"
+CROS_WORKON_COMMIT="5347a1acf63bf2a4e1481d8e2d691b6ceab85204"
+CROS_WORKON_TREE="b1c9eaca9c8b61b6365ccd947c153de5e7d53ea6"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 CROS_WORKON_EGIT_BRANCH="chromeos-2016.05"
 
diff --git a/sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.207-r1438.ebuild b/sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.208-r1439.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.207-r1438.ebuild
rename to sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.208-r1439.ebuild
index 8d0863e..ef179b9 100644
--- a/sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.207-r1438.ebuild
+++ b/sys-kernel/chromeos-kernel-4_14/chromeos-kernel-4_14-4.14.208-r1439.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1c86dde8d3e985f1f9b4088badb21c2e31162135"
-CROS_WORKON_TREE="18f5ba876e1a1e47c01748432f31210a206d0492"
+CROS_WORKON_COMMIT="9341d04d4bbd72365753cb8528408177d4e19b24"
+CROS_WORKON_TREE="234d076b27d5550039c0cc462341100d42d3c743"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v4.14"
 CROS_WORKON_EGIT_BRANCH="chromeos-4.14"
diff --git a/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.158-r1720.ebuild b/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.159-r1721.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.158-r1720.ebuild
rename to sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.159-r1721.ebuild
index 8507b9e..de583ec 100644
--- a/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.158-r1720.ebuild
+++ b/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.159-r1721.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="eb13e36e49fb322d2311b98d2cd4b8d34efd1a7e"
-CROS_WORKON_TREE="39d749b265a6f5a9303b365bf5a1142475d2f43e"
+CROS_WORKON_COMMIT="e1c8655adbba18e6752703e756e9c51b4a044bd3"
+CROS_WORKON_TREE="4a8456b0d8e97eeae151fbdad3ba5d603308559e"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v4.19"
 CROS_WORKON_EGIT_BRANCH="chromeos-4.19"
diff --git a/sys-kernel/chromeos-kernel-4_4/chromeos-kernel-4_4-4.4.244-r2505.ebuild b/sys-kernel/chromeos-kernel-4_4/chromeos-kernel-4_4-4.4.245-r2506.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-4_4/chromeos-kernel-4_4-4.4.244-r2505.ebuild
rename to sys-kernel/chromeos-kernel-4_4/chromeos-kernel-4_4-4.4.245-r2506.ebuild
index 0a27659..49661ef 100644
--- a/sys-kernel/chromeos-kernel-4_4/chromeos-kernel-4_4-4.4.244-r2505.ebuild
+++ b/sys-kernel/chromeos-kernel-4_4/chromeos-kernel-4_4-4.4.245-r2506.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="e0ac96c08322a4b486b8a7a25d3c8d466abbe83b"
-CROS_WORKON_TREE="480b71e9c124b7f502df5a5924f6282c78182b69"
+CROS_WORKON_COMMIT="1765db5d90f8757c7adaf53b511fe4e23732debf"
+CROS_WORKON_TREE="60f9f87c69fe390595dc6dd939b05ff3fcecd7cd"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v4.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-4.4"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.78-r1520.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.78-r1521.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.78-r1520.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.78-r1521.ebuild
index 41bc9f1..6bba523 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.78-r1520.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.78-r1521.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f7581f2d1a1f6a26dc55fdd9541836213b811582"
-CROS_WORKON_TREE="3bc66b3d7e4a526a6712bc92cb46b48c82d21663"
+CROS_WORKON_COMMIT="2aefa06c2ddf7c1f8de5a0ac4ca72c191fd9e17d"
+CROS_WORKON_TREE="d966db0dc08a1913dcfc57a4ae010ffb67676974"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"
diff --git a/sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2462.ebuild b/sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2463.ebuild
similarity index 82%
rename from sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2462.ebuild
rename to sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2463.ebuild
index f729bf8..8d2e6fe 100644
--- a/sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2462.ebuild
+++ b/sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2463.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b55ef9909516cce8de69bc98efabdf3e7093b550"
-CROS_WORKON_TREE="380ac7c19123addc2da0451b2379fd6bac849cc3"
+CROS_WORKON_COMMIT="5347a1acf63bf2a4e1481d8e2d691b6ceab85204"
+CROS_WORKON_TREE="b1c9eaca9c8b61b6365ccd947c153de5e7d53ea6"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 
 DESCRIPTION="lp0 resume blob for Tegra"
diff --git a/sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1961.ebuild b/sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1962.ebuild
similarity index 85%
rename from sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1961.ebuild
rename to sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1962.ebuild
index 4ec33f6..b1236a0 100644
--- a/sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1961.ebuild
+++ b/sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1962.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b55ef9909516cce8de69bc98efabdf3e7093b550"
-CROS_WORKON_TREE="380ac7c19123addc2da0451b2379fd6bac849cc3"
+CROS_WORKON_COMMIT="5347a1acf63bf2a4e1481d8e2d691b6ceab85204"
+CROS_WORKON_TREE="b1c9eaca9c8b61b6365ccd947c153de5e7d53ea6"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 
 DESCRIPTION="lp0 resume blob for Tegra"
diff --git a/sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2894.ebuild b/sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2895.ebuild
similarity index 83%
rename from sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2894.ebuild
rename to sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2895.ebuild
index 44a1659..1536bcc 100644
--- a/sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2894.ebuild
+++ b/sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2895.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b55ef9909516cce8de69bc98efabdf3e7093b550"
-CROS_WORKON_TREE="380ac7c19123addc2da0451b2379fd6bac849cc3"
+CROS_WORKON_COMMIT="5347a1acf63bf2a4e1481d8e2d691b6ceab85204"
+CROS_WORKON_TREE="b1c9eaca9c8b61b6365ccd947c153de5e7d53ea6"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 
 DESCRIPTION="lp0 resume blob for Tegra"