diff --git a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1579.ebuild b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1580.ebuild
similarity index 87%
rename from chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1579.ebuild
rename to chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1580.ebuild
index 77760da..8a6f2d7 100644
--- a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1579.ebuild
+++ b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1580.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f35f2919309cf11b0ddd9deb24a6b145d40d9254"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "28814286ed218c0ad1762a6f0596162bf72c9727" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2c9b005aa277b1e1253a0d52052aa97f66156a5f"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "105444f877cd60a0891b6fc482f37379a376aba2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r390.ebuild b/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r391.ebuild
similarity index 97%
rename from chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r390.ebuild
rename to chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r391.ebuild
index a937236..45bc3e1 100644
--- a/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r390.ebuild
+++ b/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r391.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("aa7815dcfe09549c2b680e7ed604040b932c11e6" "a77bf0779e1005c9fd840955193ac7257d67bc05" "92221d4688ed01cc361f01d650b82bf7e28078b2")
-CROS_WORKON_TREE=("0a84449022ade7710309495b0058ef7bd542c81f" "f64a48b91fc35d5760bca966436e0effc9e5cacb" "2aeca3cffd0e69db866b5623819ecd5bf8db1232")
+CROS_WORKON_COMMIT=("8d39e763aca72c79049009865fe164f59b6c6035" "a77bf0779e1005c9fd840955193ac7257d67bc05" "92221d4688ed01cc361f01d650b82bf7e28078b2")
+CROS_WORKON_TREE=("89e25f3d9d509134c56925218400e73b2e911dc9" "f64a48b91fc35d5760bca966436e0effc9e5cacb" "2aeca3cffd0e69db866b5623819ecd5bf8db1232")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/tpm2"
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7562.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7563.ebuild
similarity index 89%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7562.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7563.ebuild
index a8da5fa..a251915 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7562.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7563.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("e839b88e62457b84b5ebb324a924551732651f47" "aa7815dcfe09549c2b680e7ed604040b932c11e6")
-CROS_WORKON_TREE=("0d9f9923bc50cdfc36416f33f1573f9ab0f4059c" "0a84449022ade7710309495b0058ef7bd542c81f")
+CROS_WORKON_COMMIT=("e839b88e62457b84b5ebb324a924551732651f47" "8d39e763aca72c79049009865fe164f59b6c6035")
+CROS_WORKON_TREE=("0d9f9923bc50cdfc36416f33f1573f9ab0f4059c" "89e25f3d9d509134c56925218400e73b2e911dc9")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1762.ebuild b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1763.ebuild
similarity index 85%
rename from chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1762.ebuild
rename to chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1763.ebuild
index ab944a1..88aac08 100644
--- a/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1762.ebuild
+++ b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1763.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f35f2919309cf11b0ddd9deb24a6b145d40d9254"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "28814286ed218c0ad1762a6f0596162bf72c9727" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2c9b005aa277b1e1253a0d52052aa97f66156a5f"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "105444f877cd60a0891b6fc482f37379a376aba2" "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-r1607.ebuild b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1608.ebuild
similarity index 88%
rename from chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1607.ebuild
rename to chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1608.ebuild
index f96a394..f5a9d84 100644
--- a/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1607.ebuild
+++ b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1608.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f35f2919309cf11b0ddd9deb24a6b145d40d9254"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "28814286ed218c0ad1762a6f0596162bf72c9727" "fb2b8277318fb7e7eff84f5c7669a46bf60f19f5" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2c9b005aa277b1e1253a0d52052aa97f66156a5f"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "105444f877cd60a0891b6fc482f37379a376aba2" "fb2b8277318fb7e7eff84f5c7669a46bf60f19f5" "1454f5ebf6a159645127c22d8c4e382e8752569d" "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-r4147.ebuild b/chromeos-base/cryptohome/cryptohome-0.0.1-r4148.ebuild
similarity index 96%
rename from chromeos-base/cryptohome/cryptohome-0.0.1-r4147.ebuild
rename to chromeos-base/cryptohome/cryptohome-0.0.1-r4148.ebuild
index 81d5854..7876edb 100644
--- a/chromeos-base/cryptohome/cryptohome-0.0.1-r4147.ebuild
+++ b/chromeos-base/cryptohome/cryptohome-0.0.1-r4148.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f35f2919309cf11b0ddd9deb24a6b145d40d9254"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "28814286ed218c0ad1762a6f0596162bf72c9727" "fb2b8277318fb7e7eff84f5c7669a46bf60f19f5" "b1c7898d3f42051cbba6426c62b35476a8de5b72" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2c9b005aa277b1e1253a0d52052aa97f66156a5f"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "105444f877cd60a0891b6fc482f37379a376aba2" "fb2b8277318fb7e7eff84f5c7669a46bf60f19f5" "b1c7898d3f42051cbba6426c62b35476a8de5b72" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/shill-client/shill-client-0.0.1-r2922.ebuild b/chromeos-base/shill-client/shill-client-0.0.1-r2923.ebuild
similarity index 80%
rename from chromeos-base/shill-client/shill-client-0.0.1-r2922.ebuild
rename to chromeos-base/shill-client/shill-client-0.0.1-r2923.ebuild
index 478f2e3..80051d2 100644
--- a/chromeos-base/shill-client/shill-client-0.0.1-r2922.ebuild
+++ b/chromeos-base/shill-client/shill-client-0.0.1-r2923.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="98e44287466b74f9deefef2373acfe978c174a03"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "787f6d91bad4630a00d89dcfb4a2dd57775a8c6d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2c9b005aa277b1e1253a0d52052aa97f66156a5f"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "38aa1e329fdce000a7632025d97e0bc0de1d56bd" "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-r695.ebuild b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r696.ebuild
similarity index 85%
rename from chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r695.ebuild
rename to chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r696.ebuild
index b81fd51..78834b9 100644
--- a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r695.ebuild
+++ b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r696.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="98e44287466b74f9deefef2373acfe978c174a03"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "787f6d91bad4630a00d89dcfb4a2dd57775a8c6d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2c9b005aa277b1e1253a0d52052aa97f66156a5f"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "38aa1e329fdce000a7632025d97e0bc0de1d56bd" "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-r771.ebuild b/chromeos-base/shill-net/shill-net-0.0.1-r772.ebuild
similarity index 90%
rename from chromeos-base/shill-net/shill-net-0.0.1-r771.ebuild
rename to chromeos-base/shill-net/shill-net-0.0.1-r772.ebuild
index e680e5c..280ee15 100644
--- a/chromeos-base/shill-net/shill-net-0.0.1-r771.ebuild
+++ b/chromeos-base/shill-net/shill-net-0.0.1-r772.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="98e44287466b74f9deefef2373acfe978c174a03"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "787f6d91bad4630a00d89dcfb4a2dd57775a8c6d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2c9b005aa277b1e1253a0d52052aa97f66156a5f"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "38aa1e329fdce000a7632025d97e0bc0de1d56bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/shill/shill-0.0.5-r3099.ebuild b/chromeos-base/shill/shill-0.0.5-r3100.ebuild
similarity index 97%
rename from chromeos-base/shill/shill-0.0.5-r3099.ebuild
rename to chromeos-base/shill/shill-0.0.5-r3100.ebuild
index 192e279..ba81fe3 100644
--- a/chromeos-base/shill/shill-0.0.5-r3099.ebuild
+++ b/chromeos-base/shill/shill-0.0.5-r3100.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="98e44287466b74f9deefef2373acfe978c174a03"
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "b8893a9e8fdf8b402519c4496addb087f21fbe50" "56dc9b3a788bc68f829c1e7a1d3b6cf067c7aaf9" "4a0dedab080195bdc122d2289118df4af3ddca2c" "787f6d91bad4630a00d89dcfb4a2dd57775a8c6d" "b77be93bd5b9a461cc8508aa57571afd308e97ce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2c9b005aa277b1e1253a0d52052aa97f66156a5f"
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "b8893a9e8fdf8b402519c4496addb087f21fbe50" "56dc9b3a788bc68f829c1e7a1d3b6cf067c7aaf9" "4a0dedab080195bdc122d2289118df4af3ddca2c" "38aa1e329fdce000a7632025d97e0bc0de1d56bd" "b77be93bd5b9a461cc8508aa57571afd308e97ce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9569.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9570.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9569.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9570.ebuild
index adecab9..c72c6cc 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9569.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.2-r9570.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("5809b78fc20ca743f9ad7333cb186824ec77bc05" "9e62f787bdb066d6f6d187ba4c5614e81a2289c7")
-CROS_WORKON_TREE=("941a7472dff540e7c46c254aae52c3d37a9ae282" "22dce69eb9b87f1074930ff8ca5592eb2312c7da")
+CROS_WORKON_COMMIT=("926b214d4fb615538da4c06030b92beff44a2eb5" "9e62f787bdb066d6f6d187ba4c5614e81a2289c7")
+CROS_WORKON_TREE=("b3936c29c6e695834ac1bcb09ea4ee36943f7a39" "22dce69eb9b87f1074930ff8ca5592eb2312c7da")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9654.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9655.ebuild
similarity index 91%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9654.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9655.ebuild
index 9d18523..45a0273 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9654.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.2-r9655.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("5809b78fc20ca743f9ad7333cb186824ec77bc05" "9e62f787bdb066d6f6d187ba4c5614e81a2289c7" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
-CROS_WORKON_TREE=("941a7472dff540e7c46c254aae52c3d37a9ae282" "22dce69eb9b87f1074930ff8ca5592eb2312c7da" "dad0497090bce4480ce6b88ada1f4187c960ccf2")
+CROS_WORKON_COMMIT=("926b214d4fb615538da4c06030b92beff44a2eb5" "9e62f787bdb066d6f6d187ba4c5614e81a2289c7" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
+CROS_WORKON_TREE=("b3936c29c6e695834ac1bcb09ea4ee36943f7a39" "22dce69eb9b87f1074930ff8ca5592eb2312c7da" "dad0497090bce4480ce6b88ada1f4187c960ccf2")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1987.ebuild b/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1988.ebuild
similarity index 85%
rename from chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1987.ebuild
rename to chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1988.ebuild
index c1a4c70..b4324be 100644
--- a/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1987.ebuild
+++ b/chromeos-base/tast-tests-local-data/tast-tests-local-data-0.0.1-r1988.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="5809b78fc20ca743f9ad7333cb186824ec77bc05"
-CROS_WORKON_TREE="d5f09ea2b02921e864c11819551dab5610b8c0e2"
+CROS_WORKON_COMMIT="926b214d4fb615538da4c06030b92beff44a2eb5"
+CROS_WORKON_TREE="20a6d22642546eb42f6edc275b35b7c019757b53"
 CROS_WORKON_PROJECT=("chromiumos/platform/tast-tests")
 CROS_WORKON_LOCALNAME=("platform/tast-tests")
 CROS_WORKON_DESTDIR=("${S}")
diff --git a/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2247.ebuild b/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2248.ebuild
similarity index 90%
rename from chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2247.ebuild
rename to chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2248.ebuild
index ee65ca9..9cf60a2 100644
--- a/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2247.ebuild
+++ b/chromeos-base/tast-tests-remote-data/tast-tests-remote-data-0.0.1-r2248.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("5809b78fc20ca743f9ad7333cb186824ec77bc05" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
-CROS_WORKON_TREE="df0d5e8636bd14f90fa4723f6b84480514ce674c"
+CROS_WORKON_COMMIT=("926b214d4fb615538da4c06030b92beff44a2eb5" "7a01213d5fdc415d99fe5060a0f06fccdcee018a")
+CROS_WORKON_TREE="d28ec3d8f0d71d8aaf9e3c38da3df8352faa7404"
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/fw-testing-configs"