diff --git a/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r306.ebuild b/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r307.ebuild
similarity index 82%
rename from chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r306.ebuild
rename to chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r307.ebuild
index 8190a96..f03a11e 100644
--- a/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r306.ebuild
+++ b/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r307.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f34cf3a06f7b17b7829185630d886a5d9d3f0e75"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "427a6753c397fd78578be1c2b10e9c0def0af39b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "ac2c9f71de71bb13b6d64a1245a8ea072da49f28" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r245.ebuild b/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r246.ebuild
similarity index 95%
rename from chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r245.ebuild
rename to chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r246.ebuild
index fdeaef0..5962cf7 100644
--- a/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r245.ebuild
+++ b/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r246.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f34cf3a06f7b17b7829185630d886a5d9d3f0e75" "49dfc58d6c4c66f5d0b0d06f0161da4e602a1293")
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "c11826d432f035fb041af4bbc1a1dbe1e1376930" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "6dbc19849752c206e135ab59349ebb1cc62bb435")
+CROS_WORKON_COMMIT=("6f9011123f3656c45bb34148673aa110a22326b3" "49dfc58d6c4c66f5d0b0d06f0161da4e602a1293")
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "cd360f89c2a9c43343acba09894918cb5ef94620" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "6dbc19849752c206e135ab59349ebb1cc62bb435")
 inherit cros-constants
 
 CROS_WORKON_INCREMENTAL_BUILD="1"
diff --git a/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r174.ebuild b/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r175.ebuild
similarity index 87%
rename from chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r174.ebuild
rename to chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r175.ebuild
index dfcf507..2bc64ea 100644
--- a/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r174.ebuild
+++ b/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r175.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f34cf3a06f7b17b7829185630d886a5d9d3f0e75"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "342b6b866531740b10a35f9cf591f5980056d163" "7ef75a42aba67052842459f221271e681184cc89" "c1bde153626532428bf7409bc0597e79452c5eb8")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7743fe686ef9bd5ed2f18d1eb6cf820611970167" "7ef75a42aba67052842459f221271e681184cc89" "c1bde153626532428bf7409bc0597e79452c5eb8")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/attestation-client/attestation-client-0.0.1-r317.ebuild b/chromeos-base/attestation-client/attestation-client-0.0.1-r318.ebuild
similarity index 89%
rename from chromeos-base/attestation-client/attestation-client-0.0.1-r317.ebuild
rename to chromeos-base/attestation-client/attestation-client-0.0.1-r318.ebuild
index ec76782..21d7008 100644
--- a/chromeos-base/attestation-client/attestation-client-0.0.1-r317.ebuild
+++ b/chromeos-base/attestation-client/attestation-client-0.0.1-r318.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="f563528fd35a0e55348afa3545ed57af4b86bdbc"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "0600b54ab161a146a565fd75dba37117f7eae6ca" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8a6aa0783afea740fe52cec225aef91187cbcde6" "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-r3186.ebuild b/chromeos-base/attestation/attestation-0.0.1-r3187.ebuild
similarity index 93%
rename from chromeos-base/attestation/attestation-0.0.1-r3186.ebuild
rename to chromeos-base/attestation/attestation-0.0.1-r3187.ebuild
index 0d0c62b..605f9184 100644
--- a/chromeos-base/attestation/attestation-0.0.1-r3186.ebuild
+++ b/chromeos-base/attestation/attestation-0.0.1-r3187.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f563528fd35a0e55348afa3545ed57af4b86bdbc"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "0600b54ab161a146a565fd75dba37117f7eae6ca" "5a5465a0f498bb248c8f9fd75c10bd064c738244" "81dfbbc1756a3b4224b447e7bf10a916d97c4f66" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "8cc20aa2c0f7a2d6b073576b3e41ac39c9be2df6" "a06a3f47395fb7b584188c6852764bc773e5497e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8a6aa0783afea740fe52cec225aef91187cbcde6" "5a5465a0f498bb248c8f9fd75c10bd064c738244" "81dfbbc1756a3b4224b447e7bf10a916d97c4f66" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "8cc20aa2c0f7a2d6b073576b3e41ac39c9be2df6" "a06a3f47395fb7b584188c6852764bc773e5497e" "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-r6309.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6310.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6309.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6310.ebuild
index 436bcad..8f60e4b 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6309.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r6310.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r9098.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9099.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9098.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9099.ebuild
index 155b299..e479941 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9098.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r9099.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r4982.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4983.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4982.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4983.ebuild
index 494d5ef..9bf5938 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4982.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4983.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r9469.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9470.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9469.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9470.ebuild
index b977f84..614d300 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9469.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r9470.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r9449.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9450.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9449.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9450.ebuild
index 52e2d79..0cd0943 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9449.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r9450.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r9061.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9062.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9061.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9062.ebuild
index 4b932af..ee72e52 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9061.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r9062.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r5058.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5059.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5058.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5059.ebuild
index 1fba331..3640152 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5058.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r5059.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r10071.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10072.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10071.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10072.ebuild
index b7e3a51..0334819 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10071.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r10072.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r9621.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r9622.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r9621.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r9622.ebuild
index 53cb8ee..02c42f0 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r9621.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r9622.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r14289.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r14290.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r14289.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r14290.ebuild
index 45bfc89..27d730c 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r14289.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r14290.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r5174.ebuild b/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r5175.ebuild
similarity index 98%
rename from chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r5174.ebuild
rename to chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r5175.ebuild
index d3abd33..3bf8184 100644
--- a/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r5174.ebuild
+++ b/chromeos-base/autotest-server-tests/autotest-server-tests-0.0.2-r5175.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="06e80b36b25d6bb18277869044b6caff43c96bc8"
-CROS_WORKON_TREE="d5fca090b73d08131aee571109b77a337c42fd39"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
@@ -114,7 +114,7 @@
 	+tests_dummy_PassServer
 	+tests_dummy_FailServer
 	+tests_dummy_FlakyTestServer
-	+tests_dummy_SynchronousOffloadServer
+	+tests_stub_SynchronousOffloadServer
 	+tests_enterprise_ClearTPM
 	+tests_enterprise_KioskEnrollmentServer
 	+tests_enterprise_LongevityTrackerServer
diff --git a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2006.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2007.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2006.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2007.ebuild
index b984851..5f1d3a7 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2006.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r2007.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 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-r2644.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r2645.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r2644.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r2645.ebuild
index 2408286..ea48bba 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r2644.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r2645.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r14341.ebuild b/chromeos-base/autotest/autotest-0.0.2-r14342.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r14341.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r14342.ebuild
index dedea70..5c83693 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r14341.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r14342.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("db0799fdd3989ae3c6e92f8a8583a7515a496435" "22c5b21a61f6477ec943cde45a66526c0f2c11ad")
-CROS_WORKON_TREE=("92d41e1d76de84e19ce924a08931bf722c8a6b57" "19a599e153588e7beddcc62b22f526879f2985cf")
+CROS_WORKON_COMMIT=("573ffe2c31769ef60bc4f9dc037eca01d149345c" "22c5b21a61f6477ec943cde45a66526c0f2c11ad")
+CROS_WORKON_TREE=("f322f40e82140ffae58282b019287a4c64e642bc" "19a599e153588e7beddcc62b22f526879f2985cf")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/biod/biod-0.0.1-r2063.ebuild b/chromeos-base/biod/biod-0.0.1-r2064.ebuild
similarity index 94%
rename from chromeos-base/biod/biod-0.0.1-r2063.ebuild
rename to chromeos-base/biod/biod-0.0.1-r2064.ebuild
index c397492..923ee97 100644
--- a/chromeos-base/biod/biod-0.0.1-r2063.ebuild
+++ b/chromeos-base/biod/biod-0.0.1-r2064.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="08aee9d7a91dddd5977b31ca2a2833ba54f8d89a"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "466d9f931f0f92d5d6d07cfc7a46bdf8e3f28ddb" "aa0612733aca2d5ffa65470f07408228b473ebdb" "667180eb5db7eb65a292552b106b32aa5881c9eb" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "b1f4ad4ab3cbb07f7d6d2756b7c06a950376ea88" "aa0612733aca2d5ffa65470f07408228b473ebdb" "667180eb5db7eb65a292552b106b32aa5881c9eb" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "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-r188.ebuild b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r189.ebuild
similarity index 81%
rename from chromeos-base/biod_proxy/biod_proxy-0.0.1-r188.ebuild
rename to chromeos-base/biod_proxy/biod_proxy-0.0.1-r189.ebuild
index e14d615..4f146d0 100644
--- a/chromeos-base/biod_proxy/biod_proxy-0.0.1-r188.ebuild
+++ b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r189.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="08aee9d7a91dddd5977b31ca2a2833ba54f8d89a"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "466d9f931f0f92d5d6d07cfc7a46bdf8e3f28ddb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "b1f4ad4ab3cbb07f7d6d2756b7c06a950376ea88" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1165.ebuild b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1166.ebuild
similarity index 87%
rename from chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1165.ebuild
rename to chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1166.ebuild
index 46c9a85..17c3d03 100644
--- a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1165.ebuild
+++ b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1166.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b2f4ea16e924a3820336999192a3d619be408cee"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "6aad9de6867ce24917096cace279787e0d9513cf" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a9ed3579a46a08a64f1ac9d96a1faaa6e15720b9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/chameleon/chameleon-0.0.2-r444.ebuild b/chromeos-base/chameleon/chameleon-0.0.2-r445.ebuild
similarity index 82%
rename from chromeos-base/chameleon/chameleon-0.0.2-r444.ebuild
rename to chromeos-base/chameleon/chameleon-0.0.2-r445.ebuild
index 4be6885..8920f4b 100644
--- a/chromeos-base/chameleon/chameleon-0.0.2-r444.ebuild
+++ b/chromeos-base/chameleon/chameleon-0.0.2-r445.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="c8c40243be99b8339b86bd17d25e34bcad5af4e6"
-CROS_WORKON_TREE="26aade3e41b7c05e73867de252cff4aac1e7222a"
+CROS_WORKON_COMMIT="881f0e056f21431428db3b2dc9f1c0307c3dc321"
+CROS_WORKON_TREE="5d4fe40c80ce462da9b210a2d334f988a40123f2"
 CROS_WORKON_PROJECT="chromiumos/platform/chameleon"
 
 inherit cros-workon
diff --git a/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r114.ebuild b/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r115.ebuild
similarity index 94%
rename from chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r114.ebuild
rename to chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r115.ebuild
index 15b28ed..fd0d543 100644
--- a/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r114.ebuild
+++ b/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r115.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "049eedf136293a1ab81617017200cb31032eb384" "6cdd3e4e16d9890ff8b5fe897e4cf5a94620c315" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "0c32b7c859889403e93cba02daed08c9537ba10f" "903fe92b2526a414ef04db27fd52554a9693158a" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "049eedf136293a1ab81617017200cb31032eb384" "6cdd3e4e16d9890ff8b5fe897e4cf5a94620c315" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "0c32b7c859889403e93cba02daed08c9537ba10f" "903fe92b2526a414ef04db27fd52554a9693158a" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk iioservice/libiioservice_ipc iioservice/mojo metrics"
diff --git a/chromeos-base/cros-camera/cros-camera-0.0.1-r962.ebuild b/chromeos-base/cros-camera/cros-camera-0.0.1-r963.ebuild
similarity index 91%
rename from chromeos-base/cros-camera/cros-camera-0.0.1-r962.ebuild
rename to chromeos-base/cros-camera/cros-camera-0.0.1-r963.ebuild
index d5d1187..64edc6c 100644
--- a/chromeos-base/cros-camera/cros-camera-0.0.1-r962.ebuild
+++ b/chromeos-base/cros-camera/cros-camera-0.0.1-r963.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="a38fd8daeff40ad630b6574a8de6570d6b593a0c"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "3853c1aaf018392449473e3155a42a6de4c514b5" "9b0d49af4849355f570451641ca09d759740be73" "049eedf136293a1ab81617017200cb31032eb384" "6cdd3e4e16d9890ff8b5fe897e4cf5a94620c315" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "3853c1aaf018392449473e3155a42a6de4c514b5" "9b0d49af4849355f570451641ca09d759740be73" "049eedf136293a1ab81617017200cb31032eb384" "6cdd3e4e16d9890ff8b5fe897e4cf5a94620c315" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 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-r3208.ebuild b/chromeos-base/cros-disks/cros-disks-0.0.1-r3209.ebuild
similarity index 94%
rename from chromeos-base/cros-disks/cros-disks-0.0.1-r3208.ebuild
rename to chromeos-base/cros-disks/cros-disks-0.0.1-r3209.ebuild
index 0ccf9c02..4ba044a 100644
--- a/chromeos-base/cros-disks/cros-disks-0.0.1-r3208.ebuild
+++ b/chromeos-base/cros-disks/cros-disks-0.0.1-r3209.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="3541f05d2ee8a9d3b099da5e6480dc0e57d9fc8d"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "60af7e1bf02a44f37227944f310cf9f6fec0b6dc" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a54bf486599e8f5d48317634dce7086ad82932c9" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/crosdns/crosdns-0.0.1-r294.ebuild b/chromeos-base/crosdns/crosdns-0.0.1-r295.ebuild
similarity index 88%
rename from chromeos-base/crosdns/crosdns-0.0.1-r294.ebuild
rename to chromeos-base/crosdns/crosdns-0.0.1-r295.ebuild
index 1c36faa..1559694 100644
--- a/chromeos-base/crosdns/crosdns-0.0.1-r294.ebuild
+++ b/chromeos-base/crosdns/crosdns-0.0.1-r295.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="bcc8bc13c5f2bbfa11791814b59e92d89af2b2b6"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "5f5a0c0dbb333a39d0da3512484d799fb1cb1ee6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "33b74b183dbb5431627e063dee32ca62eb6e8937" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1347.ebuild b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1348.ebuild
similarity index 83%
rename from chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1347.ebuild
rename to chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1348.ebuild
index 4b006da..37f0a57 100644
--- a/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1347.ebuild
+++ b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1348.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b2f4ea16e924a3820336999192a3d619be408cee"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "6aad9de6867ce24917096cace279787e0d9513cf" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a9ed3579a46a08a64f1ac9d96a1faaa6e15720b9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1184.ebuild b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1185.ebuild
similarity index 87%
rename from chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1184.ebuild
rename to chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1185.ebuild
index b6406ac..d3a974e 100644
--- a/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1184.ebuild
+++ b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1185.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b2f4ea16e924a3820336999192a3d619be408cee"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "6aad9de6867ce24917096cace279787e0d9513cf" "1a305e65cfaf27dd42734a37eda080d40b377d6c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a9ed3579a46a08a64f1ac9d96a1faaa6e15720b9" "1a305e65cfaf27dd42734a37eda080d40b377d6c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/cryptohome/cryptohome-0.0.1-r3706.ebuild b/chromeos-base/cryptohome/cryptohome-0.0.1-r3707.ebuild
similarity index 97%
rename from chromeos-base/cryptohome/cryptohome-0.0.1-r3706.ebuild
rename to chromeos-base/cryptohome/cryptohome-0.0.1-r3707.ebuild
index d65277f..6629777 100644
--- a/chromeos-base/cryptohome/cryptohome-0.0.1-r3706.ebuild
+++ b/chromeos-base/cryptohome/cryptohome-0.0.1-r3707.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b2f4ea16e924a3820336999192a3d619be408cee"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "6aad9de6867ce24917096cace279787e0d9513cf" "81dfbbc1756a3b4224b447e7bf10a916d97c4f66" "1a305e65cfaf27dd42734a37eda080d40b377d6c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a9ed3579a46a08a64f1ac9d96a1faaa6e15720b9" "81dfbbc1756a3b4224b447e7bf10a916d97c4f66" "1a305e65cfaf27dd42734a37eda080d40b377d6c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r656.ebuild b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r657.ebuild
similarity index 83%
rename from chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r656.ebuild
rename to chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r657.ebuild
index d105d5e..bbd2a2c 100644
--- a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r656.ebuild
+++ b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r657.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="5508e82f21e275719f89750f507ff3c45987a762"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "cb557898eed653f640c2a5aeed48ddfa695c51fb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "afcd353b9d8c8408cf7fb45f9b3d934434a16eb5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/diagnostics/diagnostics-0.0.1-r990.ebuild b/chromeos-base/diagnostics/diagnostics-0.0.1-r991.ebuild
similarity index 95%
rename from chromeos-base/diagnostics/diagnostics-0.0.1-r990.ebuild
rename to chromeos-base/diagnostics/diagnostics-0.0.1-r991.ebuild
index 9c1153a..217535f 100644
--- a/chromeos-base/diagnostics/diagnostics-0.0.1-r990.ebuild
+++ b/chromeos-base/diagnostics/diagnostics-0.0.1-r991.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="5508e82f21e275719f89750f507ff3c45987a762"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "aa0612733aca2d5ffa65470f07408228b473ebdb" "cb557898eed653f640c2a5aeed48ddfa695c51fb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "aa0612733aca2d5ffa65470f07408228b473ebdb" "afcd353b9d8c8408cf7fb45f9b3d934434a16eb5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r449.ebuild b/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r450.ebuild
similarity index 82%
rename from chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r449.ebuild
rename to chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r450.ebuild
index 2ff0739..581d09a 100644
--- a/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r449.ebuild
+++ b/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r450.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="35ce4a70131730db80c299d8f425b2add5818319"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "3d4e95d78140e4ec93582ba14c8501ecc6817ef2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "e0da5eb8dbe45cc4e72a44ebaca7260e14bc4d22" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/dlcservice/dlcservice-0.0.1-r573.ebuild b/chromeos-base/dlcservice/dlcservice-0.0.1-r574.ebuild
similarity index 90%
rename from chromeos-base/dlcservice/dlcservice-0.0.1-r573.ebuild
rename to chromeos-base/dlcservice/dlcservice-0.0.1-r574.ebuild
index 4d28c0b..4f5ef5e 100644
--- a/chromeos-base/dlcservice/dlcservice-0.0.1-r573.ebuild
+++ b/chromeos-base/dlcservice/dlcservice-0.0.1-r574.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="35ce4a70131730db80c299d8f425b2add5818319"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "3d4e95d78140e4ec93582ba14c8501ecc6817ef2" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "e0da5eb8dbe45cc4e72a44ebaca7260e14bc4d22" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/dns-proxy/dns-proxy-0.0.1-r70.ebuild b/chromeos-base/dns-proxy/dns-proxy-0.0.1-r71.ebuild
similarity index 89%
rename from chromeos-base/dns-proxy/dns-proxy-0.0.1-r70.ebuild
rename to chromeos-base/dns-proxy/dns-proxy-0.0.1-r71.ebuild
index e98486d..c1fa323 100644
--- a/chromeos-base/dns-proxy/dns-proxy-0.0.1-r70.ebuild
+++ b/chromeos-base/dns-proxy/dns-proxy-0.0.1-r71.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="86174eb4f146aed6d1f5182351f7ed3a25629823"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "df7a5b2bb673d245287217a33110da9e6cca3c19" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "0589da423746e4e20fe7e50f7a19e2ac46e715a8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "6a93087f6ddb4402b72ae9b5f4f7da5535f33c7e" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "0589da423746e4e20fe7e50f7a19e2ac46e715a8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r219.ebuild b/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r220.ebuild
similarity index 91%
rename from chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r219.ebuild
rename to chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r220.ebuild
index 311b309..d9a1a34 100644
--- a/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r219.ebuild
+++ b/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r220.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="28acfe3e8ab4d2622bf2e7a3b7643de1c59bb89b"
-CROS_WORKON_TREE=("0600b54ab161a146a565fd75dba37117f7eae6ca" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "13b6cac5121d40667689f2d48faddcb1bb34e1bb" "a06a3f47395fb7b584188c6852764bc773e5497e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("8a6aa0783afea740fe52cec225aef91187cbcde6" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "13b6cac5121d40667689f2d48faddcb1bb34e1bb" "a06a3f47395fb7b584188c6852764bc773e5497e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/imageloader-client/imageloader-client-0.0.1-r645.ebuild b/chromeos-base/imageloader-client/imageloader-client-0.0.1-r646.ebuild
similarity index 83%
rename from chromeos-base/imageloader-client/imageloader-client-0.0.1-r645.ebuild
rename to chromeos-base/imageloader-client/imageloader-client-0.0.1-r646.ebuild
index 35859c1..a1bb899 100644
--- a/chromeos-base/imageloader-client/imageloader-client-0.0.1-r645.ebuild
+++ b/chromeos-base/imageloader-client/imageloader-client-0.0.1-r646.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f34cf3a06f7b17b7829185630d886a5d9d3f0e75"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "6de9e997fe0ace548007a32946a3eeef2d6bd39d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8742508828a5be4d730c2310952b9abe1398d014" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/imageloader/imageloader-0.0.1-r1603.ebuild b/chromeos-base/imageloader/imageloader-0.0.1-r1604.ebuild
similarity index 90%
rename from chromeos-base/imageloader/imageloader-0.0.1-r1603.ebuild
rename to chromeos-base/imageloader/imageloader-0.0.1-r1604.ebuild
index 4efcb0f..6ee60a5 100644
--- a/chromeos-base/imageloader/imageloader-0.0.1-r1603.ebuild
+++ b/chromeos-base/imageloader/imageloader-0.0.1-r1604.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f34cf3a06f7b17b7829185630d886a5d9d3f0e75"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "6de9e997fe0ace548007a32946a3eeef2d6bd39d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8742508828a5be4d730c2310952b9abe1398d014" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libec/libec-0.0.1-r35.ebuild b/chromeos-base/libec/libec-0.0.1-r36.ebuild
similarity index 89%
rename from chromeos-base/libec/libec-0.0.1-r35.ebuild
rename to chromeos-base/libec/libec-0.0.1-r36.ebuild
index c8214a2..9f22464 100644
--- a/chromeos-base/libec/libec-0.0.1-r35.ebuild
+++ b/chromeos-base/libec/libec-0.0.1-r36.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="08aee9d7a91dddd5977b31ca2a2833ba54f8d89a"
-CROS_WORKON_TREE=("466d9f931f0f92d5d6d07cfc7a46bdf8e3f28ddb" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "667180eb5db7eb65a292552b106b32aa5881c9eb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("b1f4ad4ab3cbb07f7d6d2756b7c06a950376ea88" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "667180eb5db7eb65a292552b106b32aa5881c9eb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/midis/midis-0.0.1-r1162.ebuild b/chromeos-base/midis/midis-0.0.1-r1163.ebuild
similarity index 90%
rename from chromeos-base/midis/midis-0.0.1-r1162.ebuild
rename to chromeos-base/midis/midis-0.0.1-r1163.ebuild
index a186e15..4bc6310 100644
--- a/chromeos-base/midis/midis-0.0.1-r1162.ebuild
+++ b/chromeos-base/midis/midis-0.0.1-r1163.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f34cf3a06f7b17b7829185630d886a5d9d3f0e75"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "0a57fa906058e2c3d118deba6ab8eb9e26c36d1b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "4201568ef8a1ffe39683b4c0dee8aeefc7eacfc8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r212.ebuild b/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r213.ebuild
similarity index 82%
rename from chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r212.ebuild
rename to chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r213.ebuild
index b41b1cb..b3d7952 100644
--- a/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r212.ebuild
+++ b/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r213.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="3541f05d2ee8a9d3b099da5e6480dc0e57d9fc8d"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "0008982d217fb36fe61507356982758bc16191d3" "20d593bc4f76d08b642ac2d57ed2f4f9af04ce50" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "517c3fdaddc3179ddb87307a44118265bb0c00c3" "20d593bc4f76d08b642ac2d57ed2f4f9af04ce50" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/ml/ml-0.0.1-r523.ebuild b/chromeos-base/ml/ml-0.0.1-r524.ebuild
similarity index 95%
rename from chromeos-base/ml/ml-0.0.1-r523.ebuild
rename to chromeos-base/ml/ml-0.0.1-r524.ebuild
index adc584b..743af7a 100644
--- a/chromeos-base/ml/ml-0.0.1-r523.ebuild
+++ b/chromeos-base/ml/ml-0.0.1-r524.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="3541f05d2ee8a9d3b099da5e6480dc0e57d9fc8d"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "0008982d217fb36fe61507356982758bc16191d3" "20d593bc4f76d08b642ac2d57ed2f4f9af04ce50" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "517c3fdaddc3179ddb87307a44118265bb0c00c3" "20d593bc4f76d08b642ac2d57ed2f4f9af04ce50" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 # TODO(amoylan): Set CROS_WORKON_OUTOFTREE_BUILD=1 after crbug.com/833675.
diff --git a/chromeos-base/mtpd/mtpd-0.0.1-r932.ebuild b/chromeos-base/mtpd/mtpd-0.0.1-r933.ebuild
similarity index 87%
rename from chromeos-base/mtpd/mtpd-0.0.1-r932.ebuild
rename to chromeos-base/mtpd/mtpd-0.0.1-r933.ebuild
index cdf0a7a..029ece1 100644
--- a/chromeos-base/mtpd/mtpd-0.0.1-r932.ebuild
+++ b/chromeos-base/mtpd/mtpd-0.0.1-r933.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="b91269f81317fdba85b3d764af2706966d3cca8d"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "ff2410d615f8e9730734fb2e5ffe2612635fbc7a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8f376208dea965d63708243a36895e4e7bd272b0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/oobe_config/oobe_config-0.0.1-r460.ebuild b/chromeos-base/oobe_config/oobe_config-0.0.1-r461.ebuild
similarity index 91%
rename from chromeos-base/oobe_config/oobe_config-0.0.1-r460.ebuild
rename to chromeos-base/oobe_config/oobe_config-0.0.1-r461.ebuild
index c6b4e03..b51baab 100644
--- a/chromeos-base/oobe_config/oobe_config-0.0.1-r460.ebuild
+++ b/chromeos-base/oobe_config/oobe_config-0.0.1-r461.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "c93e9f694960c5524d93b8c18a193d6bdc3c1759" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "7baa8fedddc9a906490da6057fd2cf6c54eb6207" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/pciguard/pciguard-0.0.1-r47.ebuild b/chromeos-base/pciguard/pciguard-0.0.1-r48.ebuild
similarity index 86%
rename from chromeos-base/pciguard/pciguard-0.0.1-r47.ebuild
rename to chromeos-base/pciguard/pciguard-0.0.1-r48.ebuild
index 6df01a0..6cad567 100644
--- a/chromeos-base/pciguard/pciguard-0.0.1-r47.ebuild
+++ b/chromeos-base/pciguard/pciguard-0.0.1-r48.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="e0e94579f82d5a75c40382f5c0770342ad244fef"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8746dab963ddfde3e251a33feebdeb861fb37428" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8f8f3fd6e34931380cbc9f35bf9f2bb74d9c7c8b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/system-proxy/system-proxy-0.0.1-r213.ebuild b/chromeos-base/system-proxy/system-proxy-0.0.1-r214.ebuild
similarity index 91%
rename from chromeos-base/system-proxy/system-proxy-0.0.1-r213.ebuild
rename to chromeos-base/system-proxy/system-proxy-0.0.1-r214.ebuild
index 4b73806..1550b32 100644
--- a/chromeos-base/system-proxy/system-proxy-0.0.1-r213.ebuild
+++ b/chromeos-base/system-proxy/system-proxy-0.0.1-r214.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1c2dd81ea7df97b5c1bfc46488ab253f098c75f3"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "eae0546f4ee5132d4544af4770755eb05f60cba6" "ac2c702d6e88f33cacbcd31881866478a1747196" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "eae0546f4ee5132d4544af4770755eb05f60cba6" "4ec0160713133cb6e004285d204db461280e4549" "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-r5141.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5142.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5141.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5142.ebuild
index 634fb04..7a45797 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5141.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r5142.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="db0799fdd3989ae3c6e92f8a8583a7515a496435"
-CROS_WORKON_TREE="92d41e1d76de84e19ce924a08931bf722c8a6b57"
+CROS_WORKON_COMMIT="573ffe2c31769ef60bc4f9dc037eca01d149345c"
+CROS_WORKON_TREE="f322f40e82140ffae58282b019287a4c64e642bc"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/typecd/typecd-0.0.1-r179.ebuild b/chromeos-base/typecd/typecd-0.0.1-r180.ebuild
similarity index 89%
rename from chromeos-base/typecd/typecd-0.0.1-r179.ebuild
rename to chromeos-base/typecd/typecd-0.0.1-r180.ebuild
index 367c45b..1f4faae 100644
--- a/chromeos-base/typecd/typecd-0.0.1-r179.ebuild
+++ b/chromeos-base/typecd/typecd-0.0.1-r180.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f34cf3a06f7b17b7829185630d886a5d9d3f0e75"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "d238c82cebad62de990c690bb26b39f9254bbf36" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "94b56d6d00224f6b44d9f6c77cd490426acc7c17" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1349.ebuild b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1350.ebuild
similarity index 97%
rename from chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1349.ebuild
rename to chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1350.ebuild
index a971972..28b25b7 100644
--- a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1349.ebuild
+++ b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1350.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0598acb73ca7269435e8c2f8d797d209cc04a764"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7ef75a42aba67052842459f221271e681184cc89" "6ac391aa2da8e29cd4de58f7f7b489a9dc053382" "c1bde153626532428bf7409bc0597e79452c5eb8" "01162da167ac566d9126a032da1b74f8889e9fa2" "7418121e64c49c654817d862e1474490986f4278" "1780a540acb435bb7583751430df696e44eef2e3" "50eebbe92f169d998a08ba8710d37dcef439b47d" "edcdfbcab4b3c4525ccb60500aa145d24cafd7f7" "27d31e84486e3c2a8fcf2deb13b46af8311bbae9" "82e4b5c7e0ce0efa9061a09d81555845183e8d63" "dcc85a40b5c9518fac5d6d9b571131998bd62653" "4b930736bc7da8c301f27c7a82718e7d605de289" "04812f95a99341b51d5b838c9470f7915b2a5f11" "91eccc114d7ae139f67d386eae13e0cccb5ce4a3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7ef75a42aba67052842459f221271e681184cc89" "6ac391aa2da8e29cd4de58f7f7b489a9dc053382" "c1bde153626532428bf7409bc0597e79452c5eb8" "01162da167ac566d9126a032da1b74f8889e9fa2" "7418121e64c49c654817d862e1474490986f4278" "1780a540acb435bb7583751430df696e44eef2e3" "a925c76094f1522fb121dd0f53bbb329fb608d79" "edcdfbcab4b3c4525ccb60500aa145d24cafd7f7" "27d31e84486e3c2a8fcf2deb13b46af8311bbae9" "82e4b5c7e0ce0efa9061a09d81555845183e8d63" "dcc85a40b5c9518fac5d6d9b571131998bd62653" "4b930736bc7da8c301f27c7a82718e7d605de289" "04812f95a99341b51d5b838c9470f7915b2a5f11" "91eccc114d7ae139f67d386eae13e0cccb5ce4a3")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r696.ebuild b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r697.ebuild
similarity index 82%
rename from media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r696.ebuild
rename to media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r697.ebuild
index 98af950..1065e30 100644
--- a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r696.ebuild
+++ b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r697.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "309b7116bd1f5aeb3ece4e1d90ce13f61b7e1b4b" "049eedf136293a1ab81617017200cb31032eb384" "d1fd07ac03f1ac6e670181ebd45b30e31efe5a87" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "309b7116bd1f5aeb3ece4e1d90ce13f61b7e1b4b" "049eedf136293a1ab81617017200cb31032eb384" "d1fd07ac03f1ac6e670181ebd45b30e31efe5a87" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 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/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r244.ebuild b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r245.ebuild
similarity index 88%
rename from media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r244.ebuild
rename to media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r245.ebuild
index b9f9051..f9468f4 100644
--- a/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r244.ebuild
+++ b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r245.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "318ca9f48604274cd31481e13eb9321be3d94d8f" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "318ca9f48604274cd31481e13eb9321be3d94d8f" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/tools/connector_client camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r482.ebuild b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r483.ebuild
similarity index 84%
rename from media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r482.ebuild
rename to media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r483.ebuild
index 3b74850..812e500 100644
--- a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r482.ebuild
+++ b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r483.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="a38fd8daeff40ad630b6574a8de6570d6b593a0c"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "08b12a8d5bd9bbe7ab69c8e6cd9f11b700d32b76" "309b7116bd1f5aeb3ece4e1d90ce13f61b7e1b4b" "049eedf136293a1ab81617017200cb31032eb384" "6cdd3e4e16d9890ff8b5fe897e4cf5a94620c315" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "08b12a8d5bd9bbe7ab69c8e6cd9f11b700d32b76" "309b7116bd1f5aeb3ece4e1d90ce13f61b7e1b4b" "049eedf136293a1ab81617017200cb31032eb384" "6cdd3e4e16d9890ff8b5fe897e4cf5a94620c315" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 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"
diff --git a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r902.ebuild b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r903.ebuild
similarity index 87%
rename from media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r902.ebuild
rename to media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r903.ebuild
index aab51e0..d747492 100644
--- a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r902.ebuild
+++ b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r903.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "309b7116bd1f5aeb3ece4e1d90ce13f61b7e1b4b" "049eedf136293a1ab81617017200cb31032eb384" "6cdd3e4e16d9890ff8b5fe897e4cf5a94620c315" "aa0612733aca2d5ffa65470f07408228b473ebdb" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "309b7116bd1f5aeb3ece4e1d90ce13f61b7e1b4b" "049eedf136293a1ab81617017200cb31032eb384" "6cdd3e4e16d9890ff8b5fe897e4cf5a94620c315" "aa0612733aca2d5ffa65470f07408228b473ebdb" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 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-libcab-test/cros-camera-libcab-test-0.0.1-r545.ebuild b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r546.ebuild
similarity index 81%
rename from media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r545.ebuild
rename to media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r546.ebuild
index 054ff17..15bd1da 100644
--- a/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r545.ebuild
+++ b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r546.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r228.ebuild b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r229.ebuild
similarity index 82%
rename from media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r228.ebuild
rename to media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r229.ebuild
index 140d991..b40cb66 100644
--- a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r228.ebuild
+++ b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r229.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r548.ebuild b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r549.ebuild
similarity index 80%
rename from media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r548.ebuild
rename to media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r549.ebuild
index 7cf3037..9491a2a 100644
--- a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r548.ebuild
+++ b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r549.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r601.ebuild b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r602.ebuild
similarity index 81%
rename from media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r601.ebuild
rename to media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r602.ebuild
index 907b50e..9e6544b 100644
--- a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r601.ebuild
+++ b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r602.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "049eedf136293a1ab81617017200cb31032eb384" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r620.ebuild b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r621.ebuild
similarity index 90%
rename from media-libs/cros-camera-test/cros-camera-test-0.0.1-r620.ebuild
rename to media-libs/cros-camera-test/cros-camera-test-0.0.1-r621.ebuild
index c8018d7..b1122bf 100644
--- a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r620.ebuild
+++ b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r621.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "686790e236933c99eeef7eed68f3b4c7ca629daf" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "049eedf136293a1ab81617017200cb31032eb384" "aa0612733aca2d5ffa65470f07408228b473ebdb" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "686790e236933c99eeef7eed68f3b4c7ca629daf" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "049eedf136293a1ab81617017200cb31032eb384" "aa0612733aca2d5ffa65470f07408228b473ebdb" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 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-v4l2_test/cros-camera-v4l2_test-0.0.1-r470.ebuild b/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r471.ebuild
similarity index 85%
rename from media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r470.ebuild
rename to media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r471.ebuild
index 9305e87..4da68c7 100644
--- a/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r470.ebuild
+++ b/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r471.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="65240bb3b66b94f15c5c9b5ecde982d5ea9a3f66"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "0bd8e42b4ccf03b7433caddcf4eedb4c1bb9c232" "049eedf136293a1ab81617017200cb31032eb384" "309b7116bd1f5aeb3ece4e1d90ce13f61b7e1b4b" "aa0612733aca2d5ffa65470f07408228b473ebdb" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "49e3b5c529d012af19cb326eec9cf346538d4459" "c37af7d99913a584dbfb1b64fdb83acb19e91c20" "049eedf136293a1ab81617017200cb31032eb384" "309b7116bd1f5aeb3ece4e1d90ce13f61b7e1b4b" "aa0612733aca2d5ffa65470f07408228b473ebdb" "791c6808b4f4f5f1c484108d66ff958d65f8f1e3")
 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/net-print/cups_proxy/cups_proxy-0.0.1-r185.ebuild b/net-print/cups_proxy/cups_proxy-0.0.1-r186.ebuild
similarity index 86%
rename from net-print/cups_proxy/cups_proxy-0.0.1-r185.ebuild
rename to net-print/cups_proxy/cups_proxy-0.0.1-r186.ebuild
index 9155671..4b9d60c 100644
--- a/net-print/cups_proxy/cups_proxy-0.0.1-r185.ebuild
+++ b/net-print/cups_proxy/cups_proxy-0.0.1-r186.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="1f0509ac9cc41a02c58508f83e4b3c3100fdb578"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "f1dd67bc1a382baafce82945e89bf69559c6e637" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "3d941a32a42e1b92a1e353ab03fde0c52d50b4ab" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"