diff --git a/chromeos-base/arc-setup/arc-setup-0.0.1-r1119.ebuild b/chromeos-base/arc-setup/arc-setup-0.0.1-r1120.ebuild
similarity index 93%
rename from chromeos-base/arc-setup/arc-setup-0.0.1-r1119.ebuild
rename to chromeos-base/arc-setup/arc-setup-0.0.1-r1120.ebuild
index 8fdaa50..7f297c7 100644
--- a/chromeos-base/arc-setup/arc-setup-0.0.1-r1119.ebuild
+++ b/chromeos-base/arc-setup/arc-setup-0.0.1-r1120.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "30f769edf21f58ec177eea21d09fece4c4f4b657" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "95103473360d4408de568d54c923114f318ed6d9" "316f9280ff87203d961bd29b773e08824f1c45d4" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r29.ebuild b/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r30.ebuild
similarity index 85%
rename from chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r29.ebuild
rename to chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r30.ebuild
index 3181006..2003557 100644
--- a/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r29.ebuild
+++ b/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r30.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "fbd3e931f69a0bf810c1f26f1aa1368486c77944" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "fbd3e931f69a0bf810c1f26f1aa1368486c77944" "ece7cd35500823cd396f9fdd254b18f7637e9e14" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/attestation/attestation-0.0.1-r3024.ebuild b/chromeos-base/attestation/attestation-0.0.1-r3025.ebuild
similarity index 93%
rename from chromeos-base/attestation/attestation-0.0.1-r3024.ebuild
rename to chromeos-base/attestation/attestation-0.0.1-r3025.ebuild
index 697cb27..4497d33 100644
--- a/chromeos-base/attestation/attestation-0.0.1-r3024.ebuild
+++ b/chromeos-base/attestation/attestation-0.0.1-r3025.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="59aefc9f36fbc6b2bff95c7d25d5f5a42ac01511"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ce56867041fe9945411df177d9792c8381e049e5" "0a71ef63088ea33468707e9a1c92496a285f83bf" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "c31c6cc86457dbcf9dd1098239fda92cd09d9729" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ce56867041fe9945411df177d9792c8381e049e5" "0a71ef63088ea33468707e9a1c92496a285f83bf" "989d840598227b15d78525d5f92c806011a9c158" "560dcfaf6405fec1de4abaf84150869126113ac7" "c31c6cc86457dbcf9dd1098239fda92cd09d9729" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/authpolicy/authpolicy-0.0.1-r1569.ebuild b/chromeos-base/authpolicy/authpolicy-0.0.1-r1570.ebuild
similarity index 92%
rename from chromeos-base/authpolicy/authpolicy-0.0.1-r1569.ebuild
rename to chromeos-base/authpolicy/authpolicy-0.0.1-r1570.ebuild
index 0659b5f..a188893 100644
--- a/chromeos-base/authpolicy/authpolicy-0.0.1-r1569.ebuild
+++ b/chromeos-base/authpolicy/authpolicy-0.0.1-r1570.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "53114cf4ab5fd4c8cbb60c2e336fa2b47d7c62bc" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "53114cf4ab5fd4c8cbb60c2e336fa2b47d7c62bc" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5371.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5372.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5371.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5372.ebuild
index c544b88..a1591ff 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5371.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5372.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r8160.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8161.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8160.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8161.ebuild
index e6cb7ea..44ce4b5 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8160.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8161.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r4044.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4045.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4044.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4045.ebuild
index d5fa53f..a62c9f2 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4044.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4045.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r8531.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8532.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8531.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8532.ebuild
index 0ba8d43..e3bee13 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8531.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8532.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r8511.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8512.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8511.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8512.ebuild
index 852856f..d9fd5be 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8511.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8512.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r8123.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8124.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8123.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8124.ebuild
index 69c7f8b..5e27e35 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8123.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8124.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r12774.ebuild b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12775.ebuild
similarity index 90%
rename from chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12774.ebuild
rename to chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12775.ebuild
index 4967d4e..a90301b 100644
--- a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12774.ebuild
+++ b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12775.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r4120.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4121.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4120.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4121.ebuild
index af024c1..38b82bb 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4120.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4121.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r9133.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9134.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9133.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9134.ebuild
index 240cb65..20c1683 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9133.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9134.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r8683.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8684.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8683.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8684.ebuild
index b6b26557..5d0331f 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8683.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8684.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r13350.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13351.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r13350.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r13351.ebuild
index 433c51a..362bd32 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13350.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13351.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r140.ebuild b/chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r141.ebuild
similarity index 83%
rename from chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r140.ebuild
rename to chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r141.ebuild
index cb9c2e0..469910d 100644
--- a/chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r140.ebuild
+++ b/chromeos-base/autotest-server-tests-tast/autotest-server-tests-tast-0.0.1-r141.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="5c3395fc96f3a1fbc6a39ffa3ef8de1a964794a0"
-CROS_WORKON_TREE="cc7a74488d273f0034dbc9fbf4484aa44f9e0b65"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4917.ebuild b/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4918.ebuild
similarity index 98%
rename from chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4917.ebuild
rename to chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4918.ebuild
index b453a8a..b57bb9b 100644
--- a/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4917.ebuild
+++ b/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r4918.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="71e2d78d1ef536613cb10c41ef677267e7504a9e"
-CROS_WORKON_TREE="dae557e6bbea959f383ffe51b1f2598e530ec1aa"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r1068.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1069.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1068.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1069.ebuild
index 8075735..0ff9132 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1068.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1069.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 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-r1706.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1707.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1706.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1707.ebuild
index fcb4c5f..b78daad4 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1706.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1707.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r13384.ebuild b/chromeos-base/autotest/autotest-0.0.2-r13385.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r13384.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r13385.ebuild
index fe8e22a..5ecee48 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r13384.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r13385.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("662e4a3df324a4f7f56d8cfef9a759c80d5d5c51" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
-CROS_WORKON_TREE=("582ab018ef7914188ab1c04d71d97ae10b8d4cd1" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
+CROS_WORKON_COMMIT=("7b0fabfd735805afffeafefa97d681e4da46dc15" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
+CROS_WORKON_TREE=("984dae25aa8edaf5f3cf64a71977223fca90b0e4" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/biod/biod-0.0.1-r1923.ebuild b/chromeos-base/biod/biod-0.0.1-r1924.ebuild
similarity index 92%
rename from chromeos-base/biod/biod-0.0.1-r1923.ebuild
rename to chromeos-base/biod/biod-0.0.1-r1924.ebuild
index 4793e72..5ee5970 100644
--- a/chromeos-base/biod/biod-0.0.1-r1923.ebuild
+++ b/chromeos-base/biod/biod-0.0.1-r1924.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="59aefc9f36fbc6b2bff95c7d25d5f5a42ac01511"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "db8acabf3c45873c10695d0eae3848fb255b56e4" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "df332d32930e3a52741a9261b2d9c9f09a9886ef" "316f9280ff87203d961bd29b773e08824f1c45d4" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/biod_proxy/biod_proxy-0.0.1-r117.ebuild b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r118.ebuild
similarity index 81%
rename from chromeos-base/biod_proxy/biod_proxy-0.0.1-r117.ebuild
rename to chromeos-base/biod_proxy/biod_proxy-0.0.1-r118.ebuild
index 2191ab4..ed339ce 100644
--- a/chromeos-base/biod_proxy/biod_proxy-0.0.1-r117.ebuild
+++ b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r118.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="59aefc9f36fbc6b2bff95c7d25d5f5a42ac01511"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "db8acabf3c45873c10695d0eae3848fb255b56e4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "df332d32930e3a52741a9261b2d9c9f09a9886ef" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/bootid-logger/bootid-logger-0.0.1-r26.ebuild b/chromeos-base/bootid-logger/bootid-logger-0.0.1-r27.ebuild
similarity index 81%
rename from chromeos-base/bootid-logger/bootid-logger-0.0.1-r26.ebuild
rename to chromeos-base/bootid-logger/bootid-logger-0.0.1-r27.ebuild
index b9b2a15..5a51936 100644
--- a/chromeos-base/bootid-logger/bootid-logger-0.0.1-r26.ebuild
+++ b/chromeos-base/bootid-logger/bootid-logger-0.0.1-r27.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "582f7d8d09a9afdca7e80255122c1e138318fd44" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "bb5eb47ba9b31a6ebc7856fdea2150a5756db444" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/chaps/chaps-0.0.1-r3249.ebuild b/chromeos-base/chaps/chaps-0.0.1-r3250.ebuild
similarity index 95%
rename from chromeos-base/chaps/chaps-0.0.1-r3249.ebuild
rename to chromeos-base/chaps/chaps-0.0.1-r3250.ebuild
index 87cf3f5..5d8c448 100644
--- a/chromeos-base/chaps/chaps-0.0.1-r3249.ebuild
+++ b/chromeos-base/chaps/chaps-0.0.1-r3250.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0a71ef63088ea33468707e9a1c92496a285f83bf" "8b709631d01f33411578061c0dd8bc0a0b243694" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0a71ef63088ea33468707e9a1c92496a285f83bf" "560dcfaf6405fec1de4abaf84150869126113ac7" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1667.ebuild b/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1668.ebuild
similarity index 91%
rename from chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1667.ebuild
rename to chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1668.ebuild
index ba52fdd..6ca7c44 100644
--- a/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1667.ebuild
+++ b/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1668.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="c5195993feea7953b391f363b99c807679fa3708"
-CROS_WORKON_TREE=("4fdfdbe461ccedeaaf176391c0bbb0f74943be45" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7486ee3c03582ccc091f081680e6df5b78c21491")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("4fdfdbe461ccedeaaf176391c0bbb0f74943be45" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "300f01e425d1198f256ee0b2a5308397b07094e8")
 CROS_WORKON_INCREMENTAL_BUILD=1
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4040.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4041.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4040.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4041.ebuild
index a018495..ac413f7 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4040.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4041.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("397999bf301d88e04d65a9c2c1bbee1c074405a5" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
-CROS_WORKON_TREE=("4367fcaf20c7a6914d19c63c848b74c28138e3be" "32903f97edbef88a34223ca070e127065ee58332")
+CROS_WORKON_COMMIT=("b5d83cde1dea30d19d3416f6c0e9ba703cffdbf9" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
+CROS_WORKON_TREE=("ca75b0a94ea6b00779e5a175ba08a74534c7c52e" "32903f97edbef88a34223ca070e127065ee58332")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8773.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8774.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8773.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8774.ebuild
index f51a25c..ff68ad9 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8773.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8774.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("397999bf301d88e04d65a9c2c1bbee1c074405a5" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("4367fcaf20c7a6914d19c63c848b74c28138e3be" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("b5d83cde1dea30d19d3416f6c0e9ba703cffdbf9" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("ca75b0a94ea6b00779e5a175ba08a74534c7c52e" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r631.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r632.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r631.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r632.ebuild
index 0a563f1b..7a2bb8e 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r631.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r632.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("397999bf301d88e04d65a9c2c1bbee1c074405a5" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("4367fcaf20c7a6914d19c63c848b74c28138e3be" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("b5d83cde1dea30d19d3416f6c0e9ba703cffdbf9" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("ca75b0a94ea6b00779e5a175ba08a74534c7c52e" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4176.ebuild b/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4177.ebuild
similarity index 96%
rename from chromeos-base/chromeos-init/chromeos-init-0.0.25-r4176.ebuild
rename to chromeos-base/chromeos-init/chromeos-init-0.0.25-r4177.ebuild
index 2da70cb..214201e 100644
--- a/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4176.ebuild
+++ b/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4177.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "7e8d88b080c70040d59326fb054497faa35e5e79" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "7e8d88b080c70040d59326fb054497faa35e5e79" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3443.ebuild b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3444.ebuild
similarity index 94%
rename from chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3443.ebuild
rename to chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3444.ebuild
index 24556bb..a50debc 100644
--- a/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3443.ebuild
+++ b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3444.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="59aefc9f36fbc6b2bff95c7d25d5f5a42ac01511"
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
 CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ef51dd487b36f760e134eca70c68065d70000012" "2b6d4230c92e83e39209823855064483eed04754" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
@@ -28,8 +28,10 @@
 COMMON_DEPEND="
 	chromeos-base/libbrillo:=
 	chromeos-base/vboot_reference
-	x11-libs/libxkbcommon:=
-	x11-misc/xkeyboard-config:=
+	!cros_host? (
+		x11-libs/libxkbcommon:=
+		x11-misc/xkeyboard-config:=
+	)
 "
 
 DEPEND="${COMMON_DEPEND}
diff --git a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4558.ebuild b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4559.ebuild
similarity index 93%
rename from chromeos-base/chromeos-login/chromeos-login-0.0.2-r4558.ebuild
rename to chromeos-base/chromeos-login/chromeos-login-0.0.2-r4559.ebuild
index 4a0caa0..b4cd4a7 100644
--- a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4558.ebuild
+++ b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4559.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "05f4e64492047e6a8147c9823ee1abed1f9128c3" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "e409819b18e9485db7a36cea8c63d61ded86c009" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/chromeos-zephyr-2_3/chromeos-zephyr-2_3-0.0.1-r84.ebuild b/chromeos-base/chromeos-zephyr-2_3/chromeos-zephyr-2_3-0.0.1-r85.ebuild
similarity index 88%
rename from chromeos-base/chromeos-zephyr-2_3/chromeos-zephyr-2_3-0.0.1-r84.ebuild
rename to chromeos-base/chromeos-zephyr-2_3/chromeos-zephyr-2_3-0.0.1-r85.ebuild
index 3333785..18ba5dd 100644
--- a/chromeos-base/chromeos-zephyr-2_3/chromeos-zephyr-2_3-0.0.1-r84.ebuild
+++ b/chromeos-base/chromeos-zephyr-2_3/chromeos-zephyr-2_3-0.0.1-r85.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f500629b382077c1160ce9b1333afcf0f9c08d59" "3d45bbfa2d7a20159cc65eefe8be697f3c5ef4f2" "542b2296e6d515b265e25c6b7208e8fea3014f90" "d1bc80d021f4ebc31f6e8b36f14b738cc26c7b03")
-CROS_WORKON_TREE=("facb89a05d16b343de0e83bd0905d3bb0586053f" "c8b449c296158acf7ce11ac65e2ac577247560da" "c7037905e78a10c0920e0834700c2b5888c8d114" "cbfc2404c2e411908f5e8db083daf3041b408522")
+CROS_WORKON_COMMIT=("6ceb02af830a85ee147cdd43549aedfcc21dd135" "3d45bbfa2d7a20159cc65eefe8be697f3c5ef4f2" "542b2296e6d515b265e25c6b7208e8fea3014f90" "d1bc80d021f4ebc31f6e8b36f14b738cc26c7b03")
+CROS_WORKON_TREE=("4da8e7d4db2d0742c55a08b0f9af4c423b7ddb4b" "c8b449c296158acf7ce11ac65e2ac577247560da" "c7037905e78a10c0920e0834700c2b5888c8d114" "cbfc2404c2e411908f5e8db083daf3041b408522")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/zephyr-chrome"
 	"chromiumos/third_party/zephyr"
diff --git a/chromeos-base/chromite/chromite-0.0.2-r7474.ebuild b/chromeos-base/chromite/chromite-0.0.2-r7475.ebuild
similarity index 91%
rename from chromeos-base/chromite/chromite-0.0.2-r7474.ebuild
rename to chromeos-base/chromite/chromite-0.0.2-r7475.ebuild
index 29053ef..edff199 100644
--- a/chromeos-base/chromite/chromite-0.0.2-r7474.ebuild
+++ b/chromeos-base/chromite/chromite-0.0.2-r7475.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="e779cf447ffe5258c13dd036f7c48d2bb1c5b70b"
-CROS_WORKON_TREE="f5c97d9658d9d9db5e1d7d8aa0a55274c9710c43"
+CROS_WORKON_COMMIT="ff1261785eacc19e317b8f41678e14ac2b3eb018"
+CROS_WORKON_TREE="610f94aeecf1776aa06743620178143cc6935d2c"
 CROS_WORKON_PROJECT="chromiumos/chromite"
 CROS_WORKON_LOCALNAME="../chromite"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3456.ebuild b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3457.ebuild
similarity index 96%
rename from chromeos-base/crash-reporter/crash-reporter-0.0.1-r3456.ebuild
rename to chromeos-base/crash-reporter/crash-reporter-0.0.1-r3457.ebuild
index 9e5d3ee..0c437f73 100644
--- a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3456.ebuild
+++ b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3457.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c71eae0e49b06e2c9d98a41db13d8318465b7cf9" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c71eae0e49b06e2c9d98a41db13d8318465b7cf9" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/cros-camera/cros-camera-0.0.1-r788.ebuild b/chromeos-base/cros-camera/cros-camera-0.0.1-r789.ebuild
similarity index 90%
rename from chromeos-base/cros-camera/cros-camera-0.0.1-r788.ebuild
rename to chromeos-base/cros-camera/cros-camera-0.0.1-r789.ebuild
index 6adfcfe..41d50eb 100644
--- a/chromeos-base/cros-camera/cros-camera-0.0.1-r788.ebuild
+++ b/chromeos-base/cros-camera/cros-camera-0.0.1-r789.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="dd196af2250030dd395b4dece667eb87afbab09a"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "9b78e73e685d2274061ede02fa8cee3aa67839b7" "108550b36339f46a9bb63727f9ff310df1e95c92" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "bb0e1c82e1781f4cb39218cfb2d503aea16170b4" "108550b36339f46a9bb63727f9ff310df1e95c92" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 # TODO(crbug.com/914263): camera/hal is unnecessary for this build but is
diff --git a/chromeos-base/cros-disks/cros-disks-0.0.1-r3107.ebuild b/chromeos-base/cros-disks/cros-disks-0.0.1-r3108.ebuild
similarity index 94%
rename from chromeos-base/cros-disks/cros-disks-0.0.1-r3107.ebuild
rename to chromeos-base/cros-disks/cros-disks-0.0.1-r3108.ebuild
index 80ac3ad..5c6fa4f 100644
--- a/chromeos-base/cros-disks/cros-disks-0.0.1-r3107.ebuild
+++ b/chromeos-base/cros-disks/cros-disks-0.0.1-r3108.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "36de3e5a16e585887aea4478ab5af77e96853dc3" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "36de3e5a16e585887aea4478ab5af77e96853dc3" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/crosh-extension/crosh-extension-0.38-r1061.ebuild b/chromeos-base/crosh-extension/crosh-extension-0.38-r1062.ebuild
similarity index 90%
rename from chromeos-base/crosh-extension/crosh-extension-0.38-r1061.ebuild
rename to chromeos-base/crosh-extension/crosh-extension-0.38-r1062.ebuild
index 99b594a..a11ae9f 100644
--- a/chromeos-base/crosh-extension/crosh-extension-0.38-r1061.ebuild
+++ b/chromeos-base/crosh-extension/crosh-extension-0.38-r1062.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c84c86bca44a4a20092e1371e88ce734b212e179"
-CROS_WORKON_TREE=("4375efd3f1ac8e87f0ceddd0e44abcbc88f7e536" "5a605be5ad897a5b0c3fc3c2205f069800601af3" "36af5117781647ba57d9068977666d62f026e4a1" "77ae5fe07f633a914ecfb9c4e2e4587ed3bf9d11" "cd4a1b0ea75caed81d3d789912588a3c5ff0dd51")
+CROS_WORKON_COMMIT="e7b7546274c95dc463dedb8cd56c97aa604fa523"
+CROS_WORKON_TREE=("4375efd3f1ac8e87f0ceddd0e44abcbc88f7e536" "5a605be5ad897a5b0c3fc3c2205f069800601af3" "e95e9883faf2bf625041c6a14c4f4390a712fe83" "77ae5fe07f633a914ecfb9c4e2e4587ed3bf9d11" "cd4a1b0ea75caed81d3d789912588a3c5ff0dd51")
 CROS_WORKON_PROJECT="apps/libapps"
 CROS_WORKON_LOCALNAME="third_party/libapps"
 CROS_WORKON_SUBTREE="libdot hterm nassh ssh_client terminal"
diff --git a/chromeos-base/crosvm/crosvm-0.1.0-r1140.ebuild b/chromeos-base/crosvm/crosvm-0.1.0-r1141.ebuild
similarity index 96%
rename from chromeos-base/crosvm/crosvm-0.1.0-r1140.ebuild
rename to chromeos-base/crosvm/crosvm-0.1.0-r1141.ebuild
index e9b67ef..91d2a68 100644
--- a/chromeos-base/crosvm/crosvm-0.1.0-r1140.ebuild
+++ b/chromeos-base/crosvm/crosvm-0.1.0-r1141.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fb54f3ccd933fb3eb0265f7843b97cc9a0ea08c2"
-CROS_WORKON_TREE="9600ef0f5c7f143098a6c93aab79eb6971e8d33d"
+CROS_WORKON_COMMIT="028b8044bc67ec8eeb4749ec10653273062ede1a"
+CROS_WORKON_TREE="20e80371093782b47ff145466fa3af2b1bccd0e6"
 CROS_WORKON_PROJECT="chromiumos/platform/crosvm"
 CROS_WORKON_LOCALNAME="platform/crosvm"
 CROS_WORKON_INCREMENTAL_BUILD=1
@@ -27,8 +27,8 @@
 	sys-libs/libcap:=
 	chromeos-base/libvda:=
 	chromeos-base/minijail:=
+	dev-libs/wayland:=
 	crosvm-gpu? (
-		dev-libs/wayland:=
 		media-libs/virglrenderer:=
 	)
 	crosvm-wl-dmabuf? ( media-libs/minigbm:= )
@@ -131,8 +131,8 @@
 
 src_compile() {
 	local features=(
-		$(usex crosvm-gpu gpu "")
-		$(usex crosvm-gpu virtio-gpu-next "")
+		$(usex crosvm-gpu virgl_renderer "")
+		$(usex crosvm-gpu virgl_renderer_next "")
 		$(usex crosvm-plugin plugin "")
 		$(usex crosvm-power-monitor-powerd power-monitor-powerd "")
 		$(usex crosvm-video-decoder video-decoder "")
diff --git a/chromeos-base/debugd-client/debugd-client-0.0.1-r1958.ebuild b/chromeos-base/debugd-client/debugd-client-0.0.1-r1959.ebuild
similarity index 85%
rename from chromeos-base/debugd-client/debugd-client-0.0.1-r1958.ebuild
rename to chromeos-base/debugd-client/debugd-client-0.0.1-r1959.ebuild
index 9248f1d..8baa827 100644
--- a/chromeos-base/debugd-client/debugd-client-0.0.1-r1958.ebuild
+++ b/chromeos-base/debugd-client/debugd-client-0.0.1-r1959.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e31835b2db28cdab9c6558f4495e2b706600d88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "91e3c8fb480740ad69913c55c30b0325e5467aa6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/debugd/debugd-0.0.1-r2972.ebuild b/chromeos-base/debugd/debugd-0.0.1-r2973.ebuild
similarity index 93%
rename from chromeos-base/debugd/debugd-0.0.1-r2972.ebuild
rename to chromeos-base/debugd/debugd-0.0.1-r2973.ebuild
index 8d06555..e970c5d 100644
--- a/chromeos-base/debugd/debugd-0.0.1-r2972.ebuild
+++ b/chromeos-base/debugd/debugd-0.0.1-r2973.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e31835b2db28cdab9c6558f4495e2b706600d88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "91e3c8fb480740ad69913c55c30b0325e5467aa6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/devserver/devserver-0.0.3-r836.ebuild b/chromeos-base/devserver/devserver-0.0.3-r837.ebuild
similarity index 88%
rename from chromeos-base/devserver/devserver-0.0.3-r836.ebuild
rename to chromeos-base/devserver/devserver-0.0.3-r837.ebuild
index 8067d6c..1b866d6 100644
--- a/chromeos-base/devserver/devserver-0.0.3-r836.ebuild
+++ b/chromeos-base/devserver/devserver-0.0.3-r837.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="34f2861b4e2733c20409e863ce316fd34082539a"
-CROS_WORKON_TREE="a86ee11e9af0d98581f46ed0264237b0293f9b58"
+CROS_WORKON_COMMIT="f8d4e93644c28a3ca2976a62baa2535d5680c568"
+CROS_WORKON_TREE="06496dafc80b278e4f1526cb7fe12bd5db34ab4e"
 CROS_WORKON_PROJECT="chromiumos/platform/dev-util"
 CROS_WORKON_LOCALNAME="platform/dev"
 CROS_WORKON_OUTOFTREE_BUILD="1"
diff --git a/chromeos-base/dlcservice/dlcservice-0.0.1-r486.ebuild b/chromeos-base/dlcservice/dlcservice-0.0.1-r487.ebuild
similarity index 91%
rename from chromeos-base/dlcservice/dlcservice-0.0.1-r486.ebuild
rename to chromeos-base/dlcservice/dlcservice-0.0.1-r487.ebuild
index ba09116..19a6ab5 100644
--- a/chromeos-base/dlcservice/dlcservice-0.0.1-r486.ebuild
+++ b/chromeos-base/dlcservice/dlcservice-0.0.1-r487.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "109cca3a31fda5ec20f8d3d9b2dab3bb9008a708" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "109cca3a31fda5ec20f8d3d9b2dab3bb9008a708" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6779.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6780.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r6779.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r6780.ebuild
index 7fa20b1..073e46c 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6779.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6780.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="397999bf301d88e04d65a9c2c1bbee1c074405a5"
-CROS_WORKON_TREE="4367fcaf20c7a6914d19c63c848b74c28138e3be"
+CROS_WORKON_COMMIT="b5d83cde1dea30d19d3416f6c0e9ba703cffdbf9"
+CROS_WORKON_TREE="ca75b0a94ea6b00779e5a175ba08a74534c7c52e"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 PYTHON_COMPAT=( python2_7 python3_6 )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5883.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5884.ebuild
similarity index 87%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5883.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5884.ebuild
index a9f0cb5..fe97492 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5883.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5884.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="397999bf301d88e04d65a9c2c1bbee1c074405a5"
-CROS_WORKON_TREE="4367fcaf20c7a6914d19c63c848b74c28138e3be"
+CROS_WORKON_COMMIT="b5d83cde1dea30d19d3416f6c0e9ba703cffdbf9"
+CROS_WORKON_TREE="ca75b0a94ea6b00779e5a175ba08a74534c7c52e"
 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-r8712.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r8713.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r8712.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r8713.ebuild
index 35b24f4..2d7c471 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r8712.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r8713.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="397999bf301d88e04d65a9c2c1bbee1c074405a5"
-CROS_WORKON_TREE="4367fcaf20c7a6914d19c63c848b74c28138e3be"
+CROS_WORKON_COMMIT="b5d83cde1dea30d19d3416f6c0e9ba703cffdbf9"
+CROS_WORKON_TREE="ca75b0a94ea6b00779e5a175ba08a74534c7c52e"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/factory-mini/factory-mini-0.0.1-r2000.ebuild b/chromeos-base/factory-mini/factory-mini-0.0.1-r2001.ebuild
similarity index 95%
rename from chromeos-base/factory-mini/factory-mini-0.0.1-r2000.ebuild
rename to chromeos-base/factory-mini/factory-mini-0.0.1-r2001.ebuild
index 71fe89d..b3c18a8 100644
--- a/chromeos-base/factory-mini/factory-mini-0.0.1-r2000.ebuild
+++ b/chromeos-base/factory-mini/factory-mini-0.0.1-r2001.ebuild
@@ -15,8 +15,8 @@
 # from /usr/local/bin to that file.
 
 EAPI=7
-CROS_WORKON_COMMIT="2a48c185a385e0697e58a24878eeb6bbc5d5c864"
-CROS_WORKON_TREE="6075e42bf77b4adb77c126d4c687251582f398fc"
+CROS_WORKON_COMMIT="beb2a3d17f8742625fb1377c5c71e3c438fadf61"
+CROS_WORKON_TREE="4db2f274f0b1a20bbf90c7b161c08bd39b4f7836"
 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-r1929.ebuild b/chromeos-base/factory/factory-0.2.0-r1930.ebuild
similarity index 93%
rename from chromeos-base/factory/factory-0.2.0-r1929.ebuild
rename to chromeos-base/factory/factory-0.2.0-r1930.ebuild
index 4e2e4d3..b92a359 100644
--- a/chromeos-base/factory/factory-0.2.0-r1929.ebuild
+++ b/chromeos-base/factory/factory-0.2.0-r1930.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="2a48c185a385e0697e58a24878eeb6bbc5d5c864"
-CROS_WORKON_TREE="6075e42bf77b4adb77c126d4c687251582f398fc"
+CROS_WORKON_COMMIT="beb2a3d17f8742625fb1377c5c71e3c438fadf61"
+CROS_WORKON_TREE="4db2f274f0b1a20bbf90c7b161c08bd39b4f7836"
 CROS_WORKON_PROJECT="chromiumos/platform/factory"
 CROS_WORKON_LOCALNAME="platform/factory"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/fingerprint_study/fingerprint_study-0.0.1-r19.ebuild b/chromeos-base/fingerprint_study/fingerprint_study-0.0.1-r20.ebuild
similarity index 90%
rename from chromeos-base/fingerprint_study/fingerprint_study-0.0.1-r19.ebuild
rename to chromeos-base/fingerprint_study/fingerprint_study-0.0.1-r20.ebuild
index 4c61a04..841e2c1 100644
--- a/chromeos-base/fingerprint_study/fingerprint_study-0.0.1-r19.ebuild
+++ b/chromeos-base/fingerprint_study/fingerprint_study-0.0.1-r20.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f8d60e9b2e9e71fda2271160ef708570377737bb"
-CROS_WORKON_TREE="e7f196d2c6118f9e6df2289159526121586f4dc0"
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE="22bf5c9c707720bdb284d59e175bbae5af7a3b5a"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_SUBTREE="biod/study"
diff --git a/chromeos-base/g2f_tools/g2f_tools-0.0.1-r429.ebuild b/chromeos-base/g2f_tools/g2f_tools-0.0.1-r430.ebuild
similarity index 85%
rename from chromeos-base/g2f_tools/g2f_tools-0.0.1-r429.ebuild
rename to chromeos-base/g2f_tools/g2f_tools-0.0.1-r430.ebuild
index 427f10f..4ef6c3a 100644
--- a/chromeos-base/g2f_tools/g2f_tools-0.0.1-r429.ebuild
+++ b/chromeos-base/g2f_tools/g2f_tools-0.0.1-r430.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "20ed8021024637e492670d20fa5969a2ad75e4b6" "bac582e24e715a9bb440cd200c6194a45b704591" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "989d840598227b15d78525d5f92c806011a9c158" "560dcfaf6405fec1de4abaf84150869126113ac7" "20ed8021024637e492670d20fa5969a2ad75e4b6" "bac582e24e715a9bb440cd200c6194a45b704591" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r203.ebuild b/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r204.ebuild
similarity index 84%
rename from chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r203.ebuild
rename to chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r204.ebuild
index 4885bd5..8b658c2 100644
--- a/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r203.ebuild
+++ b/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r204.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "580e5f512f707afbf93a05e1bfc01b7413e8a60f" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "580e5f512f707afbf93a05e1bfc01b7413e8a60f" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r104.ebuild b/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r105.ebuild
similarity index 83%
rename from chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r104.ebuild
rename to chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r105.ebuild
index 83c4c89..9b2b4bc 100644
--- a/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r104.ebuild
+++ b/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r105.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "580e5f512f707afbf93a05e1bfc01b7413e8a60f" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "580e5f512f707afbf93a05e1bfc01b7413e8a60f" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/hardware_verifier/..."
 )
diff --git a/chromeos-base/kerberos/kerberos-0.0.1-r273.ebuild b/chromeos-base/kerberos/kerberos-0.0.1-r274.ebuild
similarity index 94%
rename from chromeos-base/kerberos/kerberos-0.0.1-r273.ebuild
rename to chromeos-base/kerberos/kerberos-0.0.1-r274.ebuild
index 8b30b93..9a33cf1 100644
--- a/chromeos-base/kerberos/kerberos-0.0.1-r273.ebuild
+++ b/chromeos-base/kerberos/kerberos-0.0.1-r274.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "2732487a36d2401688425aac7a50e241ac208d3d" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "2732487a36d2401688425aac7a50e241ac208d3d" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libchrome/libchrome-0.0.1-r116.ebuild b/chromeos-base/libchrome/libchrome-0.0.1-r117.ebuild
similarity index 97%
rename from chromeos-base/libchrome/libchrome-0.0.1-r116.ebuild
rename to chromeos-base/libchrome/libchrome-0.0.1-r117.ebuild
index b3facee..6d457d3 100644
--- a/chromeos-base/libchrome/libchrome-0.0.1-r116.ebuild
+++ b/chromeos-base/libchrome/libchrome-0.0.1-r117.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "a61582981ab348c73a8c596944b0e0a90a370529")
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "d052a45b1769a766e6604127019ac12804d7452f")
+CROS_WORKON_COMMIT=("57779f9c27d62896f66cced9cc88443ae9585372" "013ad467b861503efffea6495a1c7cef761f5e42")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "2ba090802d2c1273cc7f04bf8f4c8414cdb5fde4")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/external/libchrome")
 CROS_WORKON_LOCALNAME=("platform2" "aosp/external/libchrome")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/libchrome")
diff --git a/chromeos-base/libsirenia/libsirenia-0.1.0-r5.ebuild b/chromeos-base/libsirenia/libsirenia-0.1.0-r6.ebuild
similarity index 89%
rename from chromeos-base/libsirenia/libsirenia-0.1.0-r5.ebuild
rename to chromeos-base/libsirenia/libsirenia-0.1.0-r6.ebuild
index 738a600..89bda24 100644
--- a/chromeos-base/libsirenia/libsirenia-0.1.0-r5.ebuild
+++ b/chromeos-base/libsirenia/libsirenia-0.1.0-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="59aefc9f36fbc6b2bff95c7d25d5f5a42ac01511"
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
 CROS_WORKON_TREE="9632d3dbd2327ea0d7c0054e521ac80fcfbf8318"
 CROS_RUST_SUBDIR="sirenia/libsirenia"
 
@@ -30,6 +30,7 @@
 	>=dev-rust/serde-1.0.114:= <dev-rust/serde-2
 	=dev-rust/serde_derive-1*:=
 	dev-rust/sys_util:=
+	>=dev-rust/thiserror-1.0.20:= <dev-rust/thiserror-2.0
 "
 
 # We skip the vsock test because it requires the vsock kernel modules to be
diff --git a/chromeos-base/lorgnette/lorgnette-0.0.1-r2979.ebuild b/chromeos-base/lorgnette/lorgnette-0.0.1-r2980.ebuild
similarity index 84%
rename from chromeos-base/lorgnette/lorgnette-0.0.1-r2979.ebuild
rename to chromeos-base/lorgnette/lorgnette-0.0.1-r2980.ebuild
index 025427e..0990c72 100644
--- a/chromeos-base/lorgnette/lorgnette-0.0.1-r2979.ebuild
+++ b/chromeos-base/lorgnette/lorgnette-0.0.1-r2980.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "be79862e1d09cb59dbae2ff2a8b318ca1a4c132e" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "d334dedf11d8cc35a56b23c705f5d2e0ae7be9a6" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r100.ebuild b/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r101.ebuild
similarity index 77%
rename from chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r100.ebuild
rename to chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r101.ebuild
index 0f49804..d84ed55 100644
--- a/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r100.ebuild
+++ b/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r101.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "be79862e1d09cb59dbae2ff2a8b318ca1a4c132e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "d334dedf11d8cc35a56b23c705f5d2e0ae7be9a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/mcastd/mcastd-0.0.1-r158.ebuild b/chromeos-base/mcastd/mcastd-0.0.1-r159.ebuild
similarity index 80%
rename from chromeos-base/mcastd/mcastd-0.0.1-r158.ebuild
rename to chromeos-base/mcastd/mcastd-0.0.1-r159.ebuild
index dd805eb..28fbb7c 100644
--- a/chromeos-base/mcastd/mcastd-0.0.1-r158.ebuild
+++ b/chromeos-base/mcastd/mcastd-0.0.1-r159.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c9a5cd52eadaa8ac49aa942605bbd180a8aa5b19"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "885d4e3b60e07bc4ee3da64bfa345ff426ecb5be" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0ea1cf7499b2a3ef57f87bc42268097e4886ce19" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/metrics/metrics-0.0.1-r3202.ebuild b/chromeos-base/metrics/metrics-0.0.1-r3203.ebuild
similarity index 93%
rename from chromeos-base/metrics/metrics-0.0.1-r3202.ebuild
rename to chromeos-base/metrics/metrics-0.0.1-r3203.ebuild
index 2a98599..c3ee89c 100644
--- a/chromeos-base/metrics/metrics-0.0.1-r3202.ebuild
+++ b/chromeos-base/metrics/metrics-0.0.1-r3203.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/mist/mist-0.0.1-r3039.ebuild b/chromeos-base/mist/mist-0.0.1-r3040.ebuild
similarity index 84%
rename from chromeos-base/mist/mist-0.0.1-r3039.ebuild
rename to chromeos-base/mist/mist-0.0.1-r3040.ebuild
index a00ab87..e1625e2 100644
--- a/chromeos-base/mist/mist-0.0.1-r3039.ebuild
+++ b/chromeos-base/mist/mist-0.0.1-r3040.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "819df31f145c1b256b5a9753dc4fc2f6681f020c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7" "819df31f145c1b256b5a9753dc4fc2f6681f020c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ndproxyd/ndproxyd-0.0.1-r158.ebuild b/chromeos-base/ndproxyd/ndproxyd-0.0.1-r159.ebuild
similarity index 80%
rename from chromeos-base/ndproxyd/ndproxyd-0.0.1-r158.ebuild
rename to chromeos-base/ndproxyd/ndproxyd-0.0.1-r159.ebuild
index 41c3a0d..b393d3f 100644
--- a/chromeos-base/ndproxyd/ndproxyd-0.0.1-r158.ebuild
+++ b/chromeos-base/ndproxyd/ndproxyd-0.0.1-r159.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c9a5cd52eadaa8ac49aa942605bbd180a8aa5b19"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "885d4e3b60e07bc4ee3da64bfa345ff426ecb5be" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0ea1cf7499b2a3ef57f87bc42268097e4886ce19" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/oobe_config/oobe_config-0.0.1-r374.ebuild b/chromeos-base/oobe_config/oobe_config-0.0.1-r375.ebuild
similarity index 94%
rename from chromeos-base/oobe_config/oobe_config-0.0.1-r374.ebuild
rename to chromeos-base/oobe_config/oobe_config-0.0.1-r375.ebuild
index 706f982..591383e 100644
--- a/chromeos-base/oobe_config/oobe_config-0.0.1-r374.ebuild
+++ b/chromeos-base/oobe_config/oobe_config-0.0.1-r375.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "1023baf673223aa6f3a095cad3bb1d878a2bef4a" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "1023baf673223aa6f3a095cad3bb1d878a2bef4a" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "560dcfaf6405fec1de4abaf84150869126113ac7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/p2p/p2p-0.0.1-r3255.ebuild b/chromeos-base/p2p/p2p-0.0.1-r3256.ebuild
similarity index 88%
rename from chromeos-base/p2p/p2p-0.0.1-r3255.ebuild
rename to chromeos-base/p2p/p2p-0.0.1-r3256.ebuild
index ea6ab7e..4dd99d1 100644
--- a/chromeos-base/p2p/p2p-0.0.1-r3255.ebuild
+++ b/chromeos-base/p2p/p2p-0.0.1-r3256.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "f8450508e6487031816df1175191c729d63d1cce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7" "f8450508e6487031816df1175191c729d63d1cce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r74.ebuild b/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r75.ebuild
similarity index 89%
rename from chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r74.ebuild
rename to chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r75.ebuild
index ae46bcb..fb74c39 100644
--- a/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r74.ebuild
+++ b/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r75.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c9a5cd52eadaa8ac49aa942605bbd180a8aa5b19"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "885d4e3b60e07bc4ee3da64bfa345ff426ecb5be" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0ea1cf7499b2a3ef57f87bc42268097e4886ce19" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/patchpanel/patchpanel-0.0.2-r182.ebuild b/chromeos-base/patchpanel/patchpanel-0.0.2-r183.ebuild
similarity index 91%
rename from chromeos-base/patchpanel/patchpanel-0.0.2-r182.ebuild
rename to chromeos-base/patchpanel/patchpanel-0.0.2-r183.ebuild
index 39985a7..7b2ad05 100644
--- a/chromeos-base/patchpanel/patchpanel-0.0.2-r182.ebuild
+++ b/chromeos-base/patchpanel/patchpanel-0.0.2-r183.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c9a5cd52eadaa8ac49aa942605bbd180a8aa5b19"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "885d4e3b60e07bc4ee3da64bfa345ff426ecb5be" "a29a344ca66578502e6000219a9211ac48c09f95" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0ea1cf7499b2a3ef57f87bc42268097e4886ce19" "a29a344ca66578502e6000219a9211ac48c09f95" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2047.ebuild b/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2048.ebuild
similarity index 81%
rename from chromeos-base/power_manager-client/power_manager-client-0.0.1-r2047.ebuild
rename to chromeos-base/power_manager-client/power_manager-client-0.0.1-r2048.ebuild
index 4e8879d..c1fd036 100644
--- a/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2047.ebuild
+++ b/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2048.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c5195993feea7953b391f363b99c807679fa3708"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "7486ee3c03582ccc091f081680e6df5b78c21491" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "300f01e425d1198f256ee0b2a5308397b07094e8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/power_manager/power_manager-0.0.2-r3617.ebuild b/chromeos-base/power_manager/power_manager-0.0.2-r3618.ebuild
similarity index 96%
rename from chromeos-base/power_manager/power_manager-0.0.2-r3617.ebuild
rename to chromeos-base/power_manager/power_manager-0.0.2-r3618.ebuild
index 59729fa..2bda736 100644
--- a/chromeos-base/power_manager/power_manager-0.0.2-r3617.ebuild
+++ b/chromeos-base/power_manager/power_manager-0.0.2-r3618.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="c5195993feea7953b391f363b99c807679fa3708"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "da25eefd3c0c9f59c7ef606fbc9c4ac8dacf0228" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "7486ee3c03582ccc091f081680e6df5b78c21491" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "da25eefd3c0c9f59c7ef606fbc9c4ac8dacf0228" "316f9280ff87203d961bd29b773e08824f1c45d4" "560dcfaf6405fec1de4abaf84150869126113ac7" "300f01e425d1198f256ee0b2a5308397b07094e8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r10.ebuild b/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r11.ebuild
similarity index 79%
rename from chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r10.ebuild
rename to chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r11.ebuild
index 0d91d18..48f14be 100644
--- a/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r10.ebuild
+++ b/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r11.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b847f02236c7222cd851f0b7035da91eab8b285" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "9a9d2bde83dd9f6bf6e938954c536fa2b435dde0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_SUBTREE="common-mk screen-capture-utils .gn"
@@ -28,6 +28,7 @@
 	!chromeos-base/screenshot
 	media-libs/libpng:0=
 	media-libs/minigbm:=
+	net-libs/libvncserver
 	x11-libs/libdrm:=
 	virtual/opengles"
 
@@ -35,5 +36,6 @@
 	x11-drivers/opengles-headers"
 
 src_install() {
+	dosbin "${OUT}/kmsvnc"
 	dosbin "${OUT}/screenshot"
 }
diff --git a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2066.ebuild b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2067.ebuild
similarity index 85%
rename from chromeos-base/session_manager-client/session_manager-client-0.0.1-r2066.ebuild
rename to chromeos-base/session_manager-client/session_manager-client-0.0.1-r2067.ebuild
index 28b5e4c..a04f39d 100644
--- a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2066.ebuild
+++ b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2067.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "05f4e64492047e6a8147c9823ee1abed1f9128c3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e409819b18e9485db7a36cea8c63d61ded86c009" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/shill-client/shill-client-0.0.1-r2263.ebuild b/chromeos-base/shill-client/shill-client-0.0.1-r2264.ebuild
similarity index 80%
rename from chromeos-base/shill-client/shill-client-0.0.1-r2263.ebuild
rename to chromeos-base/shill-client/shill-client-0.0.1-r2264.ebuild
index 3e428f7..26263ef 100644
--- a/chromeos-base/shill-client/shill-client-0.0.1-r2263.ebuild
+++ b/chromeos-base/shill-client/shill-client-0.0.1-r2264.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "03150e07eeb0532eadfe0c57ce079505dbd4a7a7" "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-r34.ebuild b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r35.ebuild
similarity index 84%
rename from chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r34.ebuild
rename to chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r35.ebuild
index 6e14e686..1a5c141 100644
--- a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r34.ebuild
+++ b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r35.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "03150e07eeb0532eadfe0c57ce079505dbd4a7a7" "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-r110.ebuild b/chromeos-base/shill-net/shill-net-0.0.1-r111.ebuild
similarity index 85%
rename from chromeos-base/shill-net/shill-net-0.0.1-r110.ebuild
rename to chromeos-base/shill-net/shill-net-0.0.1-r111.ebuild
index 55916e0..e6185ed 100644
--- a/chromeos-base/shill-net/shill-net-0.0.1-r110.ebuild
+++ b/chromeos-base/shill-net/shill-net-0.0.1-r111.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "03150e07eeb0532eadfe0c57ce079505dbd4a7a7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/shill-test-scripts/shill-test-scripts-0.0.1-r3155.ebuild b/chromeos-base/shill-test-scripts/shill-test-scripts-0.0.1-r3156.ebuild
similarity index 87%
rename from chromeos-base/shill-test-scripts/shill-test-scripts-0.0.1-r3155.ebuild
rename to chromeos-base/shill-test-scripts/shill-test-scripts-0.0.1-r3156.ebuild
index f42729a..97d2349 100644
--- a/chromeos-base/shill-test-scripts/shill-test-scripts-0.0.1-r3155.ebuild
+++ b/chromeos-base/shill-test-scripts/shill-test-scripts-0.0.1-r3156.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="dc73352d681464d3bffed1228498ce8c55a4eb92"
-CROS_WORKON_TREE="2aeac53ba60c299115bae900809c074566d9228a"
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE="c4a6ad9b8774cd66229ba54ca1853b018ae2e07b"
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/shill/shill-0.0.5-r2331.ebuild b/chromeos-base/shill/shill-0.0.5-r2332.ebuild
similarity index 96%
rename from chromeos-base/shill/shill-0.0.5-r2331.ebuild
rename to chromeos-base/shill/shill-0.0.5-r2332.ebuild
index c09efea..c0e60d1 100644
--- a/chromeos-base/shill/shill-0.0.5-r2331.ebuild
+++ b/chromeos-base/shill/shill-0.0.5-r2332.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "8b709631d01f33411578061c0dd8bc0a0b243694" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e0ed49a505c69afe4a7f216b86744c3dabcd5e4c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "560dcfaf6405fec1de4abaf84150869126113ac7" "03150e07eeb0532eadfe0c57ce079505dbd4a7a7" "e0ed49a505c69afe4a7f216b86744c3dabcd5e4c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/sirenia/sirenia-0.24.52-r33.ebuild b/chromeos-base/sirenia/sirenia-0.24.52-r34.ebuild
similarity index 91%
rename from chromeos-base/sirenia/sirenia-0.24.52-r33.ebuild
rename to chromeos-base/sirenia/sirenia-0.24.52-r34.ebuild
index 98d34ae..bc84201 100644
--- a/chromeos-base/sirenia/sirenia-0.24.52-r33.ebuild
+++ b/chromeos-base/sirenia/sirenia-0.24.52-r34.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="243da1f4b5dca7f8e606e599833affe013e0d4d9"
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
 CROS_WORKON_TREE="234f675a1ba6c10963e07936144804b0d00193ba"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
@@ -22,6 +22,7 @@
 
 DEPEND="${RDEPEND}
 	>chromeos-base/chromeos-dbus-bindings-rust-0.24.52-r16:=
+	chromeos-base/libsirenia:=
 	=dev-rust/chrono-0.4*:=
 	=dev-rust/dbus-0.8*:=
 	=dev-rust/getopts-0.2*:=
@@ -29,7 +30,7 @@
 	>=dev-rust/serde-1.0.114:= <dev-rust/serde-2
 	=dev-rust/serde_derive-1*:=
 	dev-rust/sys_util:=
-	chromeos-base/libsirenia:=
+	>=dev-rust/thiserror-1.0.20:= <dev-rust/thiserror-2.0
 "
 
 src_install() {
diff --git a/chromeos-base/sommelier/sommelier-0.0.1-r83.ebuild b/chromeos-base/sommelier/sommelier-0.0.1-r84.ebuild
similarity index 89%
rename from chromeos-base/sommelier/sommelier-0.0.1-r83.ebuild
rename to chromeos-base/sommelier/sommelier-0.0.1-r84.ebuild
index abbbd1a..faa170f 100644
--- a/chromeos-base/sommelier/sommelier-0.0.1-r83.ebuild
+++ b/chromeos-base/sommelier/sommelier-0.0.1-r84.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "3f8be0810f4ffe8b480013baf89377f2f7e67bf1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5b2bd464c087b531e11c5989f49c7d1b9b3d1524" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/system_api-rust/system_api-rust-0.24.52-r335.ebuild b/chromeos-base/system_api-rust/system_api-rust-0.24.52-r336.ebuild
similarity index 80%
rename from chromeos-base/system_api-rust/system_api-rust-0.24.52-r335.ebuild
rename to chromeos-base/system_api-rust/system_api-rust-0.24.52-r336.ebuild
index 4e88d29..52be6c3 100644
--- a/chromeos-base/system_api-rust/system_api-rust-0.24.52-r335.ebuild
+++ b/chromeos-base/system_api-rust/system_api-rust-0.24.52-r336.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f767bac25bc9880fa0758d18f93962d04fad88c2"
-CROS_WORKON_TREE=("e843dfcef0c09b0aa853eadf590be3062ce01a98" "a0d8550678a1ed2a4ab62782049032a024bf40df" "be80c2e6e90c8c30e37139c11ed431f4db093b57" "d289fda3c8ee1448b8cdf3425062327cde39dd8c")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("9bce4399e9836ea4a1d33dcddc961715edcf5ef2" "a0d8550678a1ed2a4ab62782049032a024bf40df" "be80c2e6e90c8c30e37139c11ed431f4db093b57" "98dba68cd28c82190ee09efa097e811530139082")
 CROS_RUST_SUBDIR="system_api"
 
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/system_api/system_api-0.0.1-r4163.ebuild b/chromeos-base/system_api/system_api-0.0.1-r4164.ebuild
similarity index 92%
rename from chromeos-base/system_api/system_api-0.0.1-r4163.ebuild
rename to chromeos-base/system_api/system_api-0.0.1-r4164.ebuild
index c417ca2..f590156 100644
--- a/chromeos-base/system_api/system_api-0.0.1-r4163.ebuild
+++ b/chromeos-base/system_api/system_api-0.0.1-r4164.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e843dfcef0c09b0aa853eadf590be3062ce01a98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "9bce4399e9836ea4a1d33dcddc961715edcf5ef2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/system_api/..."
 )
diff --git a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r902.ebuild b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r903.ebuild
similarity index 90%
rename from chromeos-base/tast-cmd/tast-cmd-0.0.1-r902.ebuild
rename to chromeos-base/tast-cmd/tast-cmd-0.0.1-r903.ebuild
index 6639adf..cc06472 100644
--- a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r902.ebuild
+++ b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r903.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="5d00552624d5f0caa6d6e1d79c6a1bec72900b67"
-CROS_WORKON_TREE="a69be3ea7fccd1331091d93faebfc42a8e385115"
+CROS_WORKON_COMMIT="44d0922f845cc11ac7357c000d57e02ffbe7eb4f"
+CROS_WORKON_TREE="2d73d2e7567b8cecf982de5bc92815c6fe3e3475"
 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-r853.ebuild b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r854.ebuild
similarity index 88%
rename from chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r853.ebuild
rename to chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r854.ebuild
index d8a0de6..eee4a31 100644
--- a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r853.ebuild
+++ b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r854.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="5d00552624d5f0caa6d6e1d79c6a1bec72900b67"
-CROS_WORKON_TREE="a69be3ea7fccd1331091d93faebfc42a8e385115"
+CROS_WORKON_COMMIT="44d0922f845cc11ac7357c000d57e02ffbe7eb4f"
+CROS_WORKON_TREE="2d73d2e7567b8cecf982de5bc92815c6fe3e3475"
 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-r4693.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4694.ebuild
similarity index 86%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4693.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4694.ebuild
index 8d4c4c5..bdd913e 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4693.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r4694.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("b700c269d208d062fb846ee890644ded4bb53d21" "5d00552624d5f0caa6d6e1d79c6a1bec72900b67")
-CROS_WORKON_TREE=("ecb9f681be440e0a03ebc1311a6dda3b4692a3d5" "a69be3ea7fccd1331091d93faebfc42a8e385115")
+CROS_WORKON_COMMIT=("c6668762a0e3376c05d8de52887d4c96e7bb84c0" "44d0922f845cc11ac7357c000d57e02ffbe7eb4f")
+CROS_WORKON_TREE=("e5459f0a94cb00f13960f65174c7a79e10158e91" "2d73d2e7567b8cecf982de5bc92815c6fe3e3475")
 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-r4729.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4730.ebuild
similarity index 81%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4729.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4730.ebuild
index c381eb9..adbe8fe 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4729.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r4730.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("b700c269d208d062fb846ee890644ded4bb53d21" "5d00552624d5f0caa6d6e1d79c6a1bec72900b67" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
-CROS_WORKON_TREE=("ecb9f681be440e0a03ebc1311a6dda3b4692a3d5" "a69be3ea7fccd1331091d93faebfc42a8e385115" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
+CROS_WORKON_COMMIT=("c6668762a0e3376c05d8de52887d4c96e7bb84c0" "44d0922f845cc11ac7357c000d57e02ffbe7eb4f" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
+CROS_WORKON_TREE=("e5459f0a94cb00f13960f65174c7a79e10158e91" "2d73d2e7567b8cecf982de5bc92815c6fe3e3475" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/timberslide/timberslide-0.0.1-r1488.ebuild b/chromeos-base/timberslide/timberslide-0.0.1-r1489.ebuild
similarity index 83%
rename from chromeos-base/timberslide/timberslide-0.0.1-r1488.ebuild
rename to chromeos-base/timberslide/timberslide-0.0.1-r1489.ebuild
index d32b1a2..2905b42 100644
--- a/chromeos-base/timberslide/timberslide-0.0.1-r1488.ebuild
+++ b/chromeos-base/timberslide/timberslide-0.0.1-r1489.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "4fc04a2f4186bc5f583ec5f27235868dc3343d5b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7" "4fc04a2f4186bc5f583ec5f27235868dc3343d5b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4203.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4204.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4203.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4204.ebuild
index a444ce1..da2def6 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4203.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4204.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="662e4a3df324a4f7f56d8cfef9a759c80d5d5c51"
-CROS_WORKON_TREE="582ab018ef7914188ab1c04d71d97ae10b8d4cd1"
+CROS_WORKON_COMMIT="7b0fabfd735805afffeafefa97d681e4da46dc15"
+CROS_WORKON_TREE="984dae25aa8edaf5f3cf64a71977223fca90b0e4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2135.ebuild b/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2136.ebuild
similarity index 94%
rename from chromeos-base/tpm_manager/tpm_manager-0.0.1-r2135.ebuild
rename to chromeos-base/tpm_manager/tpm_manager-0.0.1-r2136.ebuild
index 8e76872..fd1cf90 100644
--- a/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2135.ebuild
+++ b/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2136.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="59aefc9f36fbc6b2bff95c7d25d5f5a42ac01511"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "989d840598227b15d78525d5f92c806011a9c158" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "8b709631d01f33411578061c0dd8bc0a0b243694" "c31c6cc86457dbcf9dd1098239fda92cd09d9729" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "989d840598227b15d78525d5f92c806011a9c158" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "560dcfaf6405fec1de4abaf84150869126113ac7" "c31c6cc86457dbcf9dd1098239fda92cd09d9729" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/typecd/typecd-0.0.1-r94.ebuild b/chromeos-base/typecd/typecd-0.0.1-r95.ebuild
similarity index 84%
rename from chromeos-base/typecd/typecd-0.0.1-r94.ebuild
rename to chromeos-base/typecd/typecd-0.0.1-r95.ebuild
index ea2286c5..cc5d903 100644
--- a/chromeos-base/typecd/typecd-0.0.1-r94.ebuild
+++ b/chromeos-base/typecd/typecd-0.0.1-r95.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c8dd34ff9d7a2663095e200d8a1b0936fbd5a753" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "db70efe3fd2e7a879ce410187a6d719ee6d38ac8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/u2fd/u2fd-0.0.1-r1044.ebuild b/chromeos-base/u2fd/u2fd-0.0.1-r1045.ebuild
similarity index 93%
rename from chromeos-base/u2fd/u2fd-0.0.1-r1044.ebuild
rename to chromeos-base/u2fd/u2fd-0.0.1-r1045.ebuild
index 7f164d9..6e4cf07 100644
--- a/chromeos-base/u2fd/u2fd-0.0.1-r1044.ebuild
+++ b/chromeos-base/u2fd/u2fd-0.0.1-r1045.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "20ed8021024637e492670d20fa5969a2ad75e4b6" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "bac582e24e715a9bb440cd200c6194a45b704591" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "20ed8021024637e492670d20fa5969a2ad75e4b6" "989d840598227b15d78525d5f92c806011a9c158" "560dcfaf6405fec1de4abaf84150869126113ac7" "bac582e24e715a9bb440cd200c6194a45b704591" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1825.ebuild b/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1826.ebuild
similarity index 84%
rename from chromeos-base/update_engine-client/update_engine-client-0.0.1-r1825.ebuild
rename to chromeos-base/update_engine-client/update_engine-client-0.0.1-r1826.ebuild
index f163fde..09fe8dc 100644
--- a/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1825.ebuild
+++ b/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1826.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("dd196af2250030dd395b4dece667eb87afbab09a" "d5b9c7015825d38f140a3683066642c86794b5b3")
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "70bdf7e843927309318d9add99876bbe750d68fa")
+CROS_WORKON_COMMIT=("57779f9c27d62896f66cced9cc88443ae9585372" "b9ff9b6c50676962cc6257c657dd9f5a119e7d7f")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "2d83b09f51a4c00af514ba9a4d9a63e4959b9c8c")
 CROS_WORKON_LOCALNAME=("platform2" "aosp/system/update_engine")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/system/update_engine")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/update_engine")
diff --git a/chromeos-base/update_engine/update_engine-0.0.3-r3678.ebuild b/chromeos-base/update_engine/update_engine-0.0.3-r3679.ebuild
similarity index 95%
rename from chromeos-base/update_engine/update_engine-0.0.3-r3678.ebuild
rename to chromeos-base/update_engine/update_engine-0.0.3-r3679.ebuild
index bcffd20..9e99456 100644
--- a/chromeos-base/update_engine/update_engine-0.0.3-r3678.ebuild
+++ b/chromeos-base/update_engine/update_engine-0.0.3-r3679.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("dd196af2250030dd395b4dece667eb87afbab09a" "d5b9c7015825d38f140a3683066642c86794b5b3")
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "70bdf7e843927309318d9add99876bbe750d68fa")
+CROS_WORKON_COMMIT=("57779f9c27d62896f66cced9cc88443ae9585372" "b9ff9b6c50676962cc6257c657dd9f5a119e7d7f")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "2d83b09f51a4c00af514ba9a4d9a63e4959b9c8c")
 CROS_WORKON_LOCALNAME=("platform2" "aosp/system/update_engine")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/system/update_engine")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/update_engine")
diff --git a/chromeos-base/update_payload/update_payload-0.0.1-r334.ebuild b/chromeos-base/update_payload/update_payload-0.0.1-r335.ebuild
similarity index 92%
rename from chromeos-base/update_payload/update_payload-0.0.1-r334.ebuild
rename to chromeos-base/update_payload/update_payload-0.0.1-r335.ebuild
index 88a66b9..796fb94 100644
--- a/chromeos-base/update_payload/update_payload-0.0.1-r334.ebuild
+++ b/chromeos-base/update_payload/update_payload-0.0.1-r335.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="d5b9c7015825d38f140a3683066642c86794b5b3"
-CROS_WORKON_TREE="70bdf7e843927309318d9add99876bbe750d68fa"
+CROS_WORKON_COMMIT="b9ff9b6c50676962cc6257c657dd9f5a119e7d7f"
+CROS_WORKON_TREE="2d83b09f51a4c00af514ba9a4d9a63e4959b9c8c"
 PYTHON_COMPAT=( python3_{6,7} )
 
 CROS_WORKON_LOCALNAME="aosp/system/update_engine"
diff --git a/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r282.ebuild b/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r283.ebuild
similarity index 89%
rename from chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r282.ebuild
rename to chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r283.ebuild
index 6cf0129..9add9f9 100644
--- a/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r282.ebuild
+++ b/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r283.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "5dc493e2caaa42bf79c32b35650161dfbdd62747" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7" "5dc493e2caaa42bf79c32b35650161dfbdd62747" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r993.ebuild b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r994.ebuild
similarity index 93%
rename from chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r993.ebuild
rename to chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r994.ebuild
index 607aeab..6fe7ed8 100644
--- a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r993.ebuild
+++ b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r994.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ece7cd35500823cd396f9fdd254b18f7637e9e14" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1160.ebuild b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1161.ebuild
similarity index 94%
rename from chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1160.ebuild
rename to chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1161.ebuild
index 3ada1c2..2cb3c0b 100644
--- a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1160.ebuild
+++ b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1161.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7" "ece7cd35500823cd396f9fdd254b18f7637e9e14" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/dev-rust/libchromeos/libchromeos-0.1.0-r25.ebuild b/dev-rust/libchromeos/libchromeos-0.1.0-r26.ebuild
similarity index 89%
rename from dev-rust/libchromeos/libchromeos-0.1.0-r25.ebuild
rename to dev-rust/libchromeos/libchromeos-0.1.0-r26.ebuild
index 5d2efef..63a1a23 100644
--- a/dev-rust/libchromeos/libchromeos-0.1.0-r25.ebuild
+++ b/dev-rust/libchromeos/libchromeos-0.1.0-r26.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="5106cfd0d4eeae62b70cad2fe296f27f7e172e72"
-CROS_WORKON_TREE="ecd02dadf294b42f30f1c832c2befcea5db554bf"
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE="2d96baa3471bb11a40ea7acad95813e0bb917833"
 CROS_RUST_SUBDIR="libchromeos-rs"
 
 CROS_WORKON_LOCALNAME="../platform2"
diff --git a/dev-util/toolchain-utils/toolchain-utils-0.0.1-r657.ebuild b/dev-util/toolchain-utils/toolchain-utils-0.0.1-r658.ebuild
similarity index 88%
rename from dev-util/toolchain-utils/toolchain-utils-0.0.1-r657.ebuild
rename to dev-util/toolchain-utils/toolchain-utils-0.0.1-r658.ebuild
index 4547dc0..4680129 100644
--- a/dev-util/toolchain-utils/toolchain-utils-0.0.1-r657.ebuild
+++ b/dev-util/toolchain-utils/toolchain-utils-0.0.1-r658.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="a27756bd06caae7d87c5f2e57cdfdd94b81c4837"
-CROS_WORKON_TREE="b9fcd4ac56bd8414f67eb9ba753b247696ca8847"
+CROS_WORKON_COMMIT="58a786a07a0e160ebff3cc4eba04d7d609bf0a15"
+CROS_WORKON_TREE="94ea8c1b01c957458f1979019af94747c1cc25cb"
 CROS_WORKON_PROJECT="chromiumos/third_party/toolchain-utils"
 CROS_WORKON_LOCALNAME="toolchain-utils"
 
diff --git a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r576.ebuild b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r577.ebuild
similarity index 88%
rename from media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r576.ebuild
rename to media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r577.ebuild
index 0b02d40..0ab37e4 100644
--- a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r576.ebuild
+++ b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r577.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "4a915605af1cd7e632f8e36813007c5403431db2" "871bb7e6654a823f1468a5857b4c74f12aaedbb5" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "871bb7e6654a823f1468a5857b4c74f12aaedbb5" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/hal/usb camera/include camera/tools common-mk"
diff --git a/media-libs/arc-camera-service/arc-camera-service-0.0.1-r512.ebuild b/media-libs/arc-camera-service/arc-camera-service-0.0.1-r513.ebuild
similarity index 87%
rename from media-libs/arc-camera-service/arc-camera-service-0.0.1-r512.ebuild
rename to media-libs/arc-camera-service/arc-camera-service-0.0.1-r513.ebuild
index a6c355b..d870d96 100644
--- a/media-libs/arc-camera-service/arc-camera-service-0.0.1-r512.ebuild
+++ b/media-libs/arc-camera-service/arc-camera-service-0.0.1-r513.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "df8b92601642272b22c923611d7733626e13f212" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "df8b92601642272b22c923611d7733626e13f212" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/914263): camera/hal/usb is unnecessary for this build but is
diff --git a/media-libs/arc-cros-gralloc/arc-cros-gralloc-0.0.1-r382.ebuild b/media-libs/arc-cros-gralloc/arc-cros-gralloc-0.0.1-r383.ebuild
similarity index 94%
rename from media-libs/arc-cros-gralloc/arc-cros-gralloc-0.0.1-r382.ebuild
rename to media-libs/arc-cros-gralloc/arc-cros-gralloc-0.0.1-r383.ebuild
index 8736f57..a366c85 100644
--- a/media-libs/arc-cros-gralloc/arc-cros-gralloc-0.0.1-r382.ebuild
+++ b/media-libs/arc-cros-gralloc/arc-cros-gralloc-0.0.1-r383.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="150b4968810447d72714a7c88afb97d4e59fe23a"
-CROS_WORKON_TREE="5800367123ce70fa6c1390104f476ba01a4dedcb"
+CROS_WORKON_COMMIT="142dd9c4949c07a323b8d55813d208d17d7a35af"
+CROS_WORKON_TREE="7db00eff419e90ecce4ff2c98d4e84498c3c8d52"
 CROS_WORKON_PROJECT="chromiumos/platform/minigbm"
 CROS_WORKON_LOCALNAME="../platform/minigbm"
 
diff --git a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r29.ebuild b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r30.ebuild
similarity index 93%
rename from media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r29.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r30.ebuild
index 661b75d..4a98d7c 100644
--- a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r29.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r30.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="dd196af2250030dd395b4dece667eb87afbab09a"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "337cf39c25d869605b82bd8c7137f2166758e0d8" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "337cf39c25d869605b82bd8c7137f2166758e0d8" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/809389): Avoid directly including headers from other packages.
diff --git a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r355.ebuild b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r356.ebuild
similarity index 80%
rename from media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r355.ebuild
rename to media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r356.ebuild
index 84837c7..fdbdc92 100644
--- a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r355.ebuild
+++ b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r356.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "51bed6c6697ad121ad0923e5473243d064aa91be" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "51bed6c6697ad121ad0923e5473243d064aa91be" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/hal/ip camera/hal/usb camera/include camera/mojo common-mk metrics"
diff --git a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r749.ebuild b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r750.ebuild
similarity index 89%
rename from media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r749.ebuild
rename to media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r750.ebuild
index 775ab0b..f969208 100644
--- a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r749.ebuild
+++ b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r750.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/809389): Avoid directly including headers from other packages.
diff --git a/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r525.ebuild b/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r526.ebuild
similarity index 91%
rename from media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r525.ebuild
rename to media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r526.ebuild
index 8c277bb..cd07fe3 100644
--- a/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r525.ebuild
+++ b/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r526.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk metrics"
diff --git a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r502.ebuild b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r503.ebuild
similarity index 90%
rename from media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r502.ebuild
rename to media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r503.ebuild
index 7171a6b..faa8579 100644
--- a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r502.ebuild
+++ b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r503.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk metrics"
diff --git a/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r327.ebuild b/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r328.ebuild
similarity index 86%
rename from media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r327.ebuild
rename to media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r328.ebuild
index 196a986..95eaad5 100644
--- a/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r327.ebuild
+++ b/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r328.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/hal/usb chromeos-config common-mk"
diff --git a/media-libs/minigbm/minigbm-0.0.1-r436.ebuild b/media-libs/minigbm/minigbm-0.0.1-r437.ebuild
similarity index 95%
rename from media-libs/minigbm/minigbm-0.0.1-r436.ebuild
rename to media-libs/minigbm/minigbm-0.0.1-r437.ebuild
index 3af8ef1..abf4d7a 100644
--- a/media-libs/minigbm/minigbm-0.0.1-r436.ebuild
+++ b/media-libs/minigbm/minigbm-0.0.1-r437.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="150b4968810447d72714a7c88afb97d4e59fe23a"
-CROS_WORKON_TREE="5800367123ce70fa6c1390104f476ba01a4dedcb"
+CROS_WORKON_COMMIT="142dd9c4949c07a323b8d55813d208d17d7a35af"
+CROS_WORKON_TREE="7db00eff419e90ecce4ff2c98d4e84498c3c8d52"
 CROS_WORKON_PROJECT="chromiumos/platform/minigbm"
 CROS_WORKON_LOCALNAME="../platform/minigbm"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/net-wireless/bluez/bluez-5.54-r496.ebuild b/net-wireless/bluez/bluez-5.54-r497.ebuild
similarity index 94%
rename from net-wireless/bluez/bluez-5.54-r496.ebuild
rename to net-wireless/bluez/bluez-5.54-r497.ebuild
index 9db7a9a..bfe3011 100644
--- a/net-wireless/bluez/bluez-5.54-r496.ebuild
+++ b/net-wireless/bluez/bluez-5.54-r497.ebuild
@@ -7,8 +7,8 @@
 # projects are declared. During emerge, both project sources are copied to
 # their respective destination directories, and one is chosen as the
 # "working directory" in src_unpack() below based on bluez-next USE flag.
-CROS_WORKON_COMMIT=("e84ee9ad9639202a6f730659389c94a936d044bb" "e84ee9ad9639202a6f730659389c94a936d044bb" "98f5da02ce148a61efdfb2557152448f04bab51f")
-CROS_WORKON_TREE=("3afbc41ee6e6beb00a36e925d86737f41324e0f8" "3afbc41ee6e6beb00a36e925d86737f41324e0f8" "360b158f78985c19fe8b783df9fb0b6149880bc9")
+CROS_WORKON_COMMIT=("0e7cc21b0593c3d3c75971dbba0a9879742172af" "0e7cc21b0593c3d3c75971dbba0a9879742172af" "98f5da02ce148a61efdfb2557152448f04bab51f")
+CROS_WORKON_TREE=("4c1befa504b3f7611cf2230bf51cd7000d5c08ae" "4c1befa504b3f7611cf2230bf51cd7000d5c08ae" "360b158f78985c19fe8b783df9fb0b6149880bc9")
 CROS_WORKON_LOCALNAME=("bluez/current" "bluez/next" "bluez/upstream")
 CROS_WORKON_PROJECT=("chromiumos/third_party/bluez" "chromiumos/third_party/bluez" "chromiumos/third_party/bluez")
 CROS_WORKON_OPTIONAL_CHECKOUT=(
diff --git a/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4638.ebuild b/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4639.ebuild
similarity index 93%
rename from sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4638.ebuild
rename to sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4639.ebuild
index 7252672..e7ccf00 100644
--- a/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4638.ebuild
+++ b/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4639.ebuild
@@ -3,8 +3,8 @@
 # $Header:
 
 EAPI=7
-CROS_WORKON_COMMIT=("139ca9387937164941b91ec4ea5196ee95cd4ff5" "af02768dace900e7e62d6788b4ff81b57b3e0a79")
-CROS_WORKON_TREE=("c9a1a3526c61c9272ccff73b39a63e01c936b388" "012e67db92ee97a61df1d6b285f309e862df5446")
+CROS_WORKON_COMMIT=("a0e68bcc9669bc093da4b31cdd57c026d8c47c17" "af02768dace900e7e62d6788b4ff81b57b3e0a79")
+CROS_WORKON_TREE=("98d17f5864adf9c1970c5d9a173e9c6316205a9f" "012e67db92ee97a61df1d6b285f309e862df5446")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/coreboot"
 	"chromiumos/platform/vboot_reference"
diff --git a/sys-apps/flashrom/flashrom-0.9.9-r1105.ebuild b/sys-apps/flashrom/flashrom-0.9.9-r1106.ebuild
similarity index 96%
rename from sys-apps/flashrom/flashrom-0.9.9-r1105.ebuild
rename to sys-apps/flashrom/flashrom-0.9.9-r1106.ebuild
index e8cd545..245c504 100644
--- a/sys-apps/flashrom/flashrom-0.9.9-r1105.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.9-r1106.ebuild
@@ -3,8 +3,8 @@
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.4.ebuild,v 1.5 2011/09/20 16:03:21 nativemad Exp $
 
 EAPI=7
-CROS_WORKON_COMMIT="0387c261f0fe0dbffa2d126ad09b5068b6a4ca4e"
-CROS_WORKON_TREE="67f384ff3aef638619d682862837e9e21ceefb77"
+CROS_WORKON_COMMIT="10bb9ae29ae8930248423cf51b4f9b22385a43af"
+CROS_WORKON_TREE="80d3a07d3611d64276c78ff1e1cbda8df9416004"
 CROS_WORKON_PROJECT="chromiumos/third_party/flashrom"
 
 inherit cros-workon toolchain-funcs
diff --git a/sys-apps/mosys/mosys-1.2.3-r1228.ebuild b/sys-apps/mosys/mosys-1.2.3-r1229.ebuild
similarity index 91%
rename from sys-apps/mosys/mosys-1.2.3-r1228.ebuild
rename to sys-apps/mosys/mosys-1.2.3-r1229.ebuild
index 14e1077..a07467a 100644
--- a/sys-apps/mosys/mosys-1.2.3-r1228.ebuild
+++ b/sys-apps/mosys/mosys-1.2.3-r1229.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "5fcc8b925156ac3426a8e32ac800e99c5c2f0a47")
-CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "935ea194228ddd322d50e612476afa65e0eec201")
+CROS_WORKON_COMMIT=("57779f9c27d62896f66cced9cc88443ae9585372" "358a7126097e7e6ddb6d2ead7f880fc3e6ded754")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "7f8c59ae56fd14861bb19c11ea8f4378dc2a7406")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"chromiumos/platform/mosys"
diff --git a/sys-apps/superiotool/superiotool-0.0.1-r2915.ebuild b/sys-apps/superiotool/superiotool-0.0.1-r2916.ebuild
similarity index 84%
rename from sys-apps/superiotool/superiotool-0.0.1-r2915.ebuild
rename to sys-apps/superiotool/superiotool-0.0.1-r2916.ebuild
index 626a145..4f73b4d 100644
--- a/sys-apps/superiotool/superiotool-0.0.1-r2915.ebuild
+++ b/sys-apps/superiotool/superiotool-0.0.1-r2916.ebuild
@@ -3,8 +3,8 @@
 # $Header: $
 
 EAPI=4
-CROS_WORKON_COMMIT="139ca9387937164941b91ec4ea5196ee95cd4ff5"
-CROS_WORKON_TREE="c9a1a3526c61c9272ccff73b39a63e01c936b388"
+CROS_WORKON_COMMIT="a0e68bcc9669bc093da4b31cdd57c026d8c47c17"
+CROS_WORKON_TREE="98d17f5864adf9c1970c5d9a173e9c6316205a9f"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 CROS_WORKON_LOCALNAME="coreboot"
 
diff --git a/sys-boot/coreboot/coreboot-0.0.1-r4104.ebuild b/sys-boot/coreboot/coreboot-0.0.1-r4105.ebuild
similarity index 98%
rename from sys-boot/coreboot/coreboot-0.0.1-r4104.ebuild
rename to sys-boot/coreboot/coreboot-0.0.1-r4105.ebuild
index c97c478..07e2134 100644
--- a/sys-boot/coreboot/coreboot-0.0.1-r4104.ebuild
+++ b/sys-boot/coreboot/coreboot-0.0.1-r4105.ebuild
@@ -6,8 +6,8 @@
 # VERSION=REVBUMP-0.0.67
 
 EAPI=7
-CROS_WORKON_COMMIT=("139ca9387937164941b91ec4ea5196ee95cd4ff5" "943aff0c16434d558d3e1f5744d6119b49970504" "af02768dace900e7e62d6788b4ff81b57b3e0a79" "539d31ab9ea89084fa5edf7cc9ac3122786d5454" "9082f7582d7d978ab29fc542f58de163ae065d07" "ee319ae7bc59e88b60142f40a9ec1b46656de4db" "b7d5b2d6a6dd05874d86ee900ff441d261f9034c")
-CROS_WORKON_TREE=("c9a1a3526c61c9272ccff73b39a63e01c936b388" "e58b88828fa7d1946361c9ef45f9f1128cf92c89" "012e67db92ee97a61df1d6b285f309e862df5446" "3155925d35f57041703913dde70f8eebf96d79df" "9a3dae98d5e43b8fd1a6eddb17ab66ab121aa131" "45d22a8711f85c4310c0c2121d3dc8a72793d375" "c0433b88f972fa26dded401be022c1c026cd644e")
+CROS_WORKON_COMMIT=("a0e68bcc9669bc093da4b31cdd57c026d8c47c17" "943aff0c16434d558d3e1f5744d6119b49970504" "af02768dace900e7e62d6788b4ff81b57b3e0a79" "539d31ab9ea89084fa5edf7cc9ac3122786d5454" "9082f7582d7d978ab29fc542f58de163ae065d07" "ee319ae7bc59e88b60142f40a9ec1b46656de4db" "b7d5b2d6a6dd05874d86ee900ff441d261f9034c")
+CROS_WORKON_TREE=("98d17f5864adf9c1970c5d9a173e9c6316205a9f" "e58b88828fa7d1946361c9ef45f9f1128cf92c89" "012e67db92ee97a61df1d6b285f309e862df5446" "3155925d35f57041703913dde70f8eebf96d79df" "9a3dae98d5e43b8fd1a6eddb17ab66ab121aa131" "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-r3897.ebuild b/sys-boot/coreinfo/coreinfo-0.0.1-r3898.ebuild
similarity index 89%
rename from sys-boot/coreinfo/coreinfo-0.0.1-r3897.ebuild
rename to sys-boot/coreinfo/coreinfo-0.0.1-r3898.ebuild
index 9861081..beb580d1 100644
--- a/sys-boot/coreinfo/coreinfo-0.0.1-r3897.ebuild
+++ b/sys-boot/coreinfo/coreinfo-0.0.1-r3898.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="139ca9387937164941b91ec4ea5196ee95cd4ff5"
-CROS_WORKON_TREE="c9a1a3526c61c9272ccff73b39a63e01c936b388"
+CROS_WORKON_COMMIT="a0e68bcc9669bc093da4b31cdd57c026d8c47c17"
+CROS_WORKON_TREE="98d17f5864adf9c1970c5d9a173e9c6316205a9f"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 
 DESCRIPTION="coreboot's coreinfo payload"
diff --git a/sys-boot/libpayload/libpayload-0.0.1-r3965.ebuild b/sys-boot/libpayload/libpayload-0.0.1-r3966.ebuild
similarity index 95%
rename from sys-boot/libpayload/libpayload-0.0.1-r3965.ebuild
rename to sys-boot/libpayload/libpayload-0.0.1-r3966.ebuild
index 23266e7..2b30f4e 100644
--- a/sys-boot/libpayload/libpayload-0.0.1-r3965.ebuild
+++ b/sys-boot/libpayload/libpayload-0.0.1-r3966.ebuild
@@ -6,8 +6,8 @@
 # VERSION=REVBUMP-0.0.17
 
 EAPI=7
-CROS_WORKON_COMMIT="139ca9387937164941b91ec4ea5196ee95cd4ff5"
-CROS_WORKON_TREE="c9a1a3526c61c9272ccff73b39a63e01c936b388"
+CROS_WORKON_COMMIT="a0e68bcc9669bc093da4b31cdd57c026d8c47c17"
+CROS_WORKON_TREE="98d17f5864adf9c1970c5d9a173e9c6316205a9f"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 CROS_WORKON_EGIT_BRANCH="chromeos-2016.05"
 
diff --git a/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1757.ebuild b/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1758.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1757.ebuild
rename to sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1758.ebuild
index 62a81fa..94da928 100644
--- a/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1757.ebuild
+++ b/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-4.19.163-r1758.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1b933bb9d40b6836c022424418d5a59e2b6daada"
-CROS_WORKON_TREE="14e8a0ee5b3797da124fb74ff7cf4894e0cdece3"
+CROS_WORKON_COMMIT="c90bd73c6903b799ba6f6836678df3a8eaff780a"
+CROS_WORKON_TREE="d01b7bddf7f2cfa0f9e3b9d631e724c2ddaf98a7"
 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-5_10/chromeos-kernel-5_10-5.10.1-r1.ebuild b/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.1-r2.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.1-r1.ebuild
rename to sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.1-r2.ebuild
index d25af8a..3dae11d 100644
--- a/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.1-r1.ebuild
+++ b/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.1-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c36a59b9dee0d2a8be10bffefa91493d3110522f"
-CROS_WORKON_TREE="f89e7afd07fe73f200d7a8f757ac5ff366184354"
+CROS_WORKON_COMMIT="73dbeef4571d1037d5e03374fad31195f60956cf"
+CROS_WORKON_TREE="6debafadf9209b3c10eb7f7f418ed9fc120c3f5b"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.10"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.10"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1622.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1623.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1622.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1623.ebuild
index d47f97e..b3e199a 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1622.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1623.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="86bc6c4b8a1aca259bbc10f335571fa3fab3ee62"
-CROS_WORKON_TREE="0d122fb08845a66cfcc8b2f8e43338b6a70772cf"
+CROS_WORKON_COMMIT="52e0d2376d1f9aef8c148aca77f270dff3dad034"
+CROS_WORKON_TREE="79de19cfafd662ba92e4d72586cae5ba16298128"
 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-r2482.ebuild b/sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2483.ebuild
similarity index 82%
rename from sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2482.ebuild
rename to sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2483.ebuild
index d94e83a..9566ef9 100644
--- a/sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2482.ebuild
+++ b/sys-kernel/tegra_lp0_resume-t132/tegra_lp0_resume-t132-0.0.1-r2483.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="139ca9387937164941b91ec4ea5196ee95cd4ff5"
-CROS_WORKON_TREE="c9a1a3526c61c9272ccff73b39a63e01c936b388"
+CROS_WORKON_COMMIT="a0e68bcc9669bc093da4b31cdd57c026d8c47c17"
+CROS_WORKON_TREE="98d17f5864adf9c1970c5d9a173e9c6316205a9f"
 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-r1981.ebuild b/sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1982.ebuild
similarity index 85%
rename from sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1981.ebuild
rename to sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1982.ebuild
index c07d983..51a1abc 100644
--- a/sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1981.ebuild
+++ b/sys-kernel/tegra_lp0_resume-t210/tegra_lp0_resume-t210-0.0.1-r1982.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="139ca9387937164941b91ec4ea5196ee95cd4ff5"
-CROS_WORKON_TREE="c9a1a3526c61c9272ccff73b39a63e01c936b388"
+CROS_WORKON_COMMIT="a0e68bcc9669bc093da4b31cdd57c026d8c47c17"
+CROS_WORKON_TREE="98d17f5864adf9c1970c5d9a173e9c6316205a9f"
 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-r2914.ebuild b/sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2915.ebuild
similarity index 83%
rename from sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2914.ebuild
rename to sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2915.ebuild
index a99ba8c..c120214 100644
--- a/sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2914.ebuild
+++ b/sys-kernel/tegra_lp0_resume/tegra_lp0_resume-0.0.1-r2915.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="139ca9387937164941b91ec4ea5196ee95cd4ff5"
-CROS_WORKON_TREE="c9a1a3526c61c9272ccff73b39a63e01c936b388"
+CROS_WORKON_COMMIT="a0e68bcc9669bc093da4b31cdd57c026d8c47c17"
+CROS_WORKON_TREE="98d17f5864adf9c1970c5d9a173e9c6316205a9f"
 CROS_WORKON_PROJECT="chromiumos/third_party/coreboot"
 
 DESCRIPTION="lp0 resume blob for Tegra"
diff --git a/virtual/target-chromium-os/target-chromium-os-1-r149.ebuild b/virtual/target-chromium-os/target-chromium-os-1-r150.ebuild
similarity index 99%
rename from virtual/target-chromium-os/target-chromium-os-1-r149.ebuild
rename to virtual/target-chromium-os/target-chromium-os-1-r150.ebuild
index e2c7e17..7fe2f79 100644
--- a/virtual/target-chromium-os/target-chromium-os-1-r149.ebuild
+++ b/virtual/target-chromium-os/target-chromium-os-1-r150.ebuild
@@ -42,6 +42,7 @@
 	dptf
 	eclog
 	+fonts
+	fpstudy
 	fuzzer
 	fwupd
 	hammerd
@@ -166,6 +167,7 @@
 	input_devices_evdev? ( app-misc/evtest )
 	syslog? ( app-admin/rsyslog chromeos-base/croslog sys-apps/journald )
 	biod? ( chromeos-base/biod )
+	fpstudy? ( chromeos-base/fingerprint_study )
 	compupdates? ( chromeos-base/imageloader )
 	dlc? ( chromeos-base/dlcservice )
 	dlc_test? (