diff --git a/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r153.ebuild b/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r154.ebuild
similarity index 97%
rename from chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r153.ebuild
rename to chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r154.ebuild
index 2ff19dc..1a4c3dd 100644
--- a/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r153.ebuild
+++ b/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r154.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "ca937b5dd7fe354c288f354903654f85da548315" "e5c1dfc419bec2f682a9c17a4f8d75cabd69f848")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "b51e097c1127c4a9fa83ddbcc88b5d4d5f95a60f" "bbf597e1cd2e3f49a8a2aab9f85c903867311558")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "ca937b5dd7fe354c288f354903654f85da548315" "e5c1dfc419bec2f682a9c17a4f8d75cabd69f848")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "b51e097c1127c4a9fa83ddbcc88b5d4d5f95a60f" "bbf597e1cd2e3f49a8a2aab9f85c903867311558")
 inherit cros-constants
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/arc-adbd/arc-adbd-0.0.1-r339.ebuild b/chromeos-base/arc-adbd/arc-adbd-0.0.1-r340.ebuild
similarity index 86%
rename from chromeos-base/arc-adbd/arc-adbd-0.0.1-r339.ebuild
rename to chromeos-base/arc-adbd/arc-adbd-0.0.1-r340.ebuild
index a8bc818..595ad87 100644
--- a/chromeos-base/arc-adbd/arc-adbd-0.0.1-r339.ebuild
+++ b/chromeos-base/arc-adbd/arc-adbd-0.0.1-r340.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("a2c45ab60a41214142130b1d1051df94cac1e37a" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("a2c45ab60a41214142130b1d1051df94cac1e37a" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r345.ebuild b/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r346.ebuild
similarity index 90%
rename from chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r345.ebuild
rename to chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r346.ebuild
index 688a7e7..042a1f7 100644
--- a/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r345.ebuild
+++ b/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r346.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e79a39f8f3a26e740eca5db95629cfb2e5d434aa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e79a39f8f3a26e740eca5db95629cfb2e5d434aa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r272.ebuild b/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r273.ebuild
similarity index 88%
rename from chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r272.ebuild
rename to chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r273.ebuild
index 3c15095..68da338 100644
--- a/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r272.ebuild
+++ b/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r273.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "870cb50e86dd81c388ef1d394f6a1c290dfe726d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "870cb50e86dd81c388ef1d394f6a1c290dfe726d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-base/arc-base-0.0.1-r367.ebuild b/chromeos-base/arc-base/arc-base-0.0.1-r368.ebuild
similarity index 95%
rename from chromeos-base/arc-base/arc-base-0.0.1-r367.ebuild
rename to chromeos-base/arc-base/arc-base-0.0.1-r368.ebuild
index e22e097..6063c4d 100644
--- a/chromeos-base/arc-base/arc-base-0.0.1-r367.ebuild
+++ b/chromeos-base/arc-base/arc-base-0.0.1-r368.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "9fc9c94a2d45e1fa0d13e8eab0e41814a9cd8c42" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "9fc9c94a2d45e1fa0d13e8eab0e41814a9cd8c42" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r151.ebuild b/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r152.ebuild
similarity index 90%
rename from chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r151.ebuild
rename to chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r152.ebuild
index c31434b..5a6f5b4 100644
--- a/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r151.ebuild
+++ b/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r152.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "3635cafaa1e2fe54b2dd06c40c2a17b4e4659039" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "3635cafaa1e2fe54b2dd06c40c2a17b4e4659039" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r39.ebuild b/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r40.ebuild
similarity index 91%
rename from chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r39.ebuild
rename to chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r40.ebuild
index 88cf1f7..751a4a5a 100644
--- a/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r39.ebuild
+++ b/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r40.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="df08dfaddce3638f899ba5ffffaf8994049a3c55"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "7eabed196d01863338304dc38454608d554693f5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "7eabed196d01863338304dc38454608d554693f5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 inherit cros-constants
 
 CROS_WORKON_INCREMENTAL_BUILD="1"
diff --git a/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r32.ebuild b/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r33.ebuild
similarity index 87%
rename from chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r32.ebuild
rename to chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r33.ebuild
index 236a83a..0dad2e7 100644
--- a/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r32.ebuild
+++ b/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r33.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "bd7a8b8c2a72289b8a9bad9133c39c6184921fe2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "bd7a8b8c2a72289b8a9bad9133c39c6184921fe2" "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-r207.ebuild b/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r208.ebuild
similarity index 96%
rename from chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r207.ebuild
rename to chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r208.ebuild
index 9a0013b..4258ae5 100644
--- a/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r207.ebuild
+++ b/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r208.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("df08dfaddce3638f899ba5ffffaf8994049a3c55" "49dfc58d6c4c66f5d0b0d06f0161da4e602a1293")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e5985f3efb670edc1fbc6fcbd15357368b9a0cc7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "6dbc19849752c206e135ab59349ebb1cc62bb435")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "49dfc58d6c4c66f5d0b0d06f0161da4e602a1293")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e5985f3efb670edc1fbc6fcbd15357368b9a0cc7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "6dbc19849752c206e135ab59349ebb1cc62bb435")
 inherit cros-constants
 
 CROS_WORKON_INCREMENTAL_BUILD="1"
diff --git a/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r172.ebuild b/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r173.ebuild
similarity index 88%
rename from chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r172.ebuild
rename to chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r173.ebuild
index 9e07355..355195b 100644
--- a/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r172.ebuild
+++ b/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r173.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "b57e2ad70d19860bc232a8efb9f0184de086c82f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "b57e2ad70d19860bc232a8efb9f0184de086c82f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r422.ebuild b/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r423.ebuild
similarity index 92%
rename from chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r422.ebuild
rename to chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r423.ebuild
index 42c220d..869c223 100644
--- a/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r422.ebuild
+++ b/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r423.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="df08dfaddce3638f899ba5ffffaf8994049a3c55"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "d530cceec5d2c60c71f02b70f0cdd617e82f2d0c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "d530cceec5d2c60c71f02b70f0cdd617e82f2d0c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r264.ebuild b/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r265.ebuild
similarity index 89%
rename from chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r264.ebuild
rename to chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r265.ebuild
index a2336c6..c15e024 100644
--- a/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r264.ebuild
+++ b/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r265.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "2fd3846666a234d4f8f558b916cd2b4c270e8d54" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "2fd3846666a234d4f8f558b916cd2b4c270e8d54" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r266.ebuild b/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r267.ebuild
similarity index 91%
rename from chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r266.ebuild
rename to chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r267.ebuild
index f3e5370..ad63110 100644
--- a/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r266.ebuild
+++ b/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r267.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "2bd3f2208f90e7c6e42e1b037e211615995f768a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "2bd3f2208f90e7c6e42e1b037e211615995f768a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r48.ebuild b/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r49.ebuild
similarity index 87%
rename from chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r48.ebuild
rename to chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r49.ebuild
index 9bc853c..1dec157 100644
--- a/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r48.ebuild
+++ b/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r49.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "bae8e46c4679621bad2d76d6a6af03776cd3ed13" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "bae8e46c4679621bad2d76d6a6af03776cd3ed13" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arc-setup/arc-setup-0.0.1-r1118.ebuild b/chromeos-base/arc-setup/arc-setup-0.0.1-r1119.ebuild
similarity index 96%
rename from chromeos-base/arc-setup/arc-setup-0.0.1-r1118.ebuild
rename to chromeos-base/arc-setup/arc-setup-0.0.1-r1119.ebuild
index dd0afd0..8fdaa50 100644
--- a/chromeos-base/arc-setup/arc-setup-0.0.1-r1118.ebuild
+++ b/chromeos-base/arc-setup/arc-setup-0.0.1-r1119.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "30f769edf21f58ec177eea21d09fece4c4f4b657" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "30f769edf21f58ec177eea21d09fece4c4f4b657" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r70.ebuild b/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r71.ebuild
similarity index 90%
rename from chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r70.ebuild
rename to chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r71.ebuild
index 8f4ddf5..9d55915 100644
--- a/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r70.ebuild
+++ b/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r71.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "546ca65e6631a7978be69ea8f13df0d99a1bc230" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "546ca65e6631a7978be69ea8f13df0d99a1bc230" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r102.ebuild b/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r103.ebuild
similarity index 92%
rename from chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r102.ebuild
rename to chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r103.ebuild
index a72fa57..cb96c5c 100644
--- a/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r102.ebuild
+++ b/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r103.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "5f82348f0756946f82fc4836a7f42fd9a77ca6fa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5f82348f0756946f82fc4836a7f42fd9a77ca6fa" "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-r28.ebuild b/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r29.ebuild
similarity index 90%
rename from chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r28.ebuild
rename to chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r29.ebuild
index 0abd62b..3181006 100644
--- a/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r28.ebuild
+++ b/chromeos-base/arcvm-forward-pstore/arcvm-forward-pstore-0.0.1-r29.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="af2fe252bed3130cd6d5137b6c1969193f810ff1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "fbd3e931f69a0bf810c1f26f1aa1368486c77944" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "fbd3e931f69a0bf810c1f26f1aa1368486c77944" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r3.ebuild b/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r4.ebuild
similarity index 89%
rename from chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r3.ebuild
rename to chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r4.ebuild
index 9a7b07c..65c0832 100644
--- a/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r3.ebuild
+++ b/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r4.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0598f6aab193a1da93fd10036c100a1d800350bc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0598f6aab193a1da93fd10036c100a1d800350bc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r37.ebuild b/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r38.ebuild
similarity index 87%
rename from chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r37.ebuild
rename to chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r38.ebuild
index 3adaf31..f5fc6d7 100644
--- a/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r37.ebuild
+++ b/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r38.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "10be1d75630283036659b9818855f0803e9a28a3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "10be1d75630283036659b9818855f0803e9a28a3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/atrusctl/atrusctl-0.0.1-r944.ebuild b/chromeos-base/atrusctl/atrusctl-0.0.1-r945.ebuild
similarity index 90%
rename from chromeos-base/atrusctl/atrusctl-0.0.1-r944.ebuild
rename to chromeos-base/atrusctl/atrusctl-0.0.1-r945.ebuild
index e8618ef..720e7d5 100644
--- a/chromeos-base/atrusctl/atrusctl-0.0.1-r944.ebuild
+++ b/chromeos-base/atrusctl/atrusctl-0.0.1-r945.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "208deab991d44b8ee7e44178523274c703a192da")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "57316388d694574a7609aa55d46812e8fab1e30c")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "208deab991d44b8ee7e44178523274c703a192da")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "57316388d694574a7609aa55d46812e8fab1e30c")
 CROS_WORKON_LOCALNAME=("platform2" "third_party/atrusctl")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/atrusctl")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/atrusctl")
diff --git a/chromeos-base/attestation-client/attestation-client-0.0.1-r255.ebuild b/chromeos-base/attestation-client/attestation-client-0.0.1-r256.ebuild
similarity index 92%
rename from chromeos-base/attestation-client/attestation-client-0.0.1-r255.ebuild
rename to chromeos-base/attestation-client/attestation-client-0.0.1-r256.ebuild
index 2570252..ac6c74d 100644
--- a/chromeos-base/attestation-client/attestation-client-0.0.1-r255.ebuild
+++ b/chromeos-base/attestation-client/attestation-client-0.0.1-r256.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="4b2d5b29c42d5d97536783fe2739031d18e01643"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "ce56867041fe9945411df177d9792c8381e049e5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ce56867041fe9945411df177d9792c8381e049e5" "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-r3022.ebuild b/chromeos-base/attestation/attestation-0.0.1-r3023.ebuild
similarity index 95%
rename from chromeos-base/attestation/attestation-0.0.1-r3022.ebuild
rename to chromeos-base/attestation/attestation-0.0.1-r3023.ebuild
index f846ef8..12ba302 100644
--- a/chromeos-base/attestation/attestation-0.0.1-r3022.ebuild
+++ b/chromeos-base/attestation/attestation-0.0.1-r3023.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="ca821c18f0d4e702204e0bea55bb627b9591a187"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "ce56867041fe9945411df177d9792c8381e049e5" "0a71ef63088ea33468707e9a1c92496a285f83bf" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "a33cb2ef1e36a1d6c4c593dd3c575cfadca384dd" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ce56867041fe9945411df177d9792c8381e049e5" "0a71ef63088ea33468707e9a1c92496a285f83bf" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "a33cb2ef1e36a1d6c4c593dd3c575cfadca384dd" "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-r1568.ebuild b/chromeos-base/authpolicy/authpolicy-0.0.1-r1569.ebuild
similarity index 95%
rename from chromeos-base/authpolicy/authpolicy-0.0.1-r1568.ebuild
rename to chromeos-base/authpolicy/authpolicy-0.0.1-r1569.ebuild
index e59300e..0659b5f 100644
--- a/chromeos-base/authpolicy/authpolicy-0.0.1-r1568.ebuild
+++ b/chromeos-base/authpolicy/authpolicy-0.0.1-r1569.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "53114cf4ab5fd4c8cbb60c2e336fa2b47d7c62bc" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "53114cf4ab5fd4c8cbb60c2e336fa2b47d7c62bc" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r5365.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5366.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5365.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5366.ebuild
index 5d9c490..82488a4 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5365.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r5366.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r8154.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8155.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8154.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8155.ebuild
index 72857b4..5f39eec 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8154.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r8155.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r4038.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4039.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4038.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4039.ebuild
index e9f5799..d4a5133 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4038.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r4039.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r8525.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8526.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8525.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8526.ebuild
index 1496dee..4361dff 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8525.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r8526.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r8505.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8506.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8505.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8506.ebuild
index acf417d..acebec2 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8505.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r8506.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r8117.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8118.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8117.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8118.ebuild
index fb74ff4..8399969 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8117.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r8118.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r12768.ebuild b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12769.ebuild
similarity index 90%
rename from chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12768.ebuild
rename to chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12769.ebuild
index 06d1968..943a1ab 100644
--- a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12768.ebuild
+++ b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r12769.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r4114.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4115.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4114.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4115.ebuild
index 8be5739..5c4d2d5 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4114.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r4115.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r9127.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9128.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9127.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9128.ebuild
index 00c7be5..494d81e 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9127.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r9128.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r8677.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8678.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8677.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8678.ebuild
index 2ada603..df027dc 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8677.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r8678.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r13344.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13345.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r13344.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r13345.ebuild
index e7e749c..7e09990 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13344.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r13345.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3394.ebuild b/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3395.ebuild
similarity index 91%
rename from chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3394.ebuild
rename to chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3395.ebuild
index 94c02c2..8fe67ca 100644
--- a/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3394.ebuild
+++ b/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-0.0.1-r3395.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="a1ddc3a1217d5e59e59afc359e392a7a9d3e3c89"
-CROS_WORKON_TREE="971e6aa99b65195e11d71760d29a0f07c4764863"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r1062.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1063.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1062.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1063.ebuild
index c49a347..32b2826 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1062.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r1063.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 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-r1700.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1701.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1700.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1701.ebuild
index edfa45b..962597a 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1700.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r1701.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r13378.ebuild b/chromeos-base/autotest/autotest-0.0.2-r13379.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r13378.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r13379.ebuild
index c1c2863..5acdb7d 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r13378.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r13379.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("7f1bc11ec5cc44c67a6286df080c3894253f39b1" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
-CROS_WORKON_TREE=("417b6138c945aa89b1cb81984ccfe5923c4a83cd" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
+CROS_WORKON_COMMIT=("ffd483109ae4a7676be44556b82c23d59cdbda69" "cc8d76349da4407d40f1aad42bb46f02bc1f7c5b")
+CROS_WORKON_TREE=("c08c7b15eb0c97630e1d970bad7385cb9818c7b2" "7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3039.ebuild b/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3040.ebuild
similarity index 89%
rename from chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3039.ebuild
rename to chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3040.ebuild
index 443bd38..101b382 100644
--- a/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3039.ebuild
+++ b/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3040.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "14b6fd3d7578253c962f4b445afae5204929e198" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "14b6fd3d7578253c962f4b445afae5204929e198" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"
diff --git a/chromeos-base/biod/biod-0.0.1-r1921.ebuild b/chromeos-base/biod/biod-0.0.1-r1922.ebuild
similarity index 95%
rename from chromeos-base/biod/biod-0.0.1-r1921.ebuild
rename to chromeos-base/biod/biod-0.0.1-r1922.ebuild
index ca3c7cc..2f784ff 100644
--- a/chromeos-base/biod/biod-0.0.1-r1921.ebuild
+++ b/chromeos-base/biod/biod-0.0.1-r1922.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "6394b788ed09e76678c636e9b34a88c144e86de4" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "6394b788ed09e76678c636e9b34a88c144e86de4" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r115.ebuild b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r116.ebuild
similarity index 87%
rename from chromeos-base/biod_proxy/biod_proxy-0.0.1-r115.ebuild
rename to chromeos-base/biod_proxy/biod_proxy-0.0.1-r116.ebuild
index 3f3b486..58f0bf0 100644
--- a/chromeos-base/biod_proxy/biod_proxy-0.0.1-r115.ebuild
+++ b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r116.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "6394b788ed09e76678c636e9b34a88c144e86de4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "6394b788ed09e76678c636e9b34a88c144e86de4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/bluetooth/bluetooth-0.0.1-r621.ebuild b/chromeos-base/bluetooth/bluetooth-0.0.1-r622.ebuild
similarity index 92%
rename from chromeos-base/bluetooth/bluetooth-0.0.1-r621.ebuild
rename to chromeos-base/bluetooth/bluetooth-0.0.1-r622.ebuild
index 8f3453e..f2a1528 100644
--- a/chromeos-base/bluetooth/bluetooth-0.0.1-r621.ebuild
+++ b/chromeos-base/bluetooth/bluetooth-0.0.1-r622.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "316f9280ff87203d961bd29b773e08824f1c45d4" "1110d3ab53ee11f181e1853ce8d9dfe37b41a8ec" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "1110d3ab53ee11f181e1853ce8d9dfe37b41a8ec" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/bootid-logger/bootid-logger-0.0.1-r25.ebuild b/chromeos-base/bootid-logger/bootid-logger-0.0.1-r26.ebuild
similarity index 87%
rename from chromeos-base/bootid-logger/bootid-logger-0.0.1-r25.ebuild
rename to chromeos-base/bootid-logger/bootid-logger-0.0.1-r26.ebuild
index 08a514f..b9b2a15 100644
--- a/chromeos-base/bootid-logger/bootid-logger-0.0.1-r25.ebuild
+++ b/chromeos-base/bootid-logger/bootid-logger-0.0.1-r26.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "582f7d8d09a9afdca7e80255122c1e138318fd44" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "582f7d8d09a9afdca7e80255122c1e138318fd44" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r948.ebuild b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r949.ebuild
similarity index 91%
rename from chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r948.ebuild
rename to chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r949.ebuild
index 2288396..2c66e55 100644
--- a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r948.ebuild
+++ b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r949.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cfcbf83ca747c14a0052fb28822f24ba01b2c083"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0692d85476ca6c7d99d06761df3ce1faed340384" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0692d85476ca6c7d99d06761df3ce1faed340384" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/bootstat/bootstat-0.0.2-r3080.ebuild b/chromeos-base/bootstat/bootstat-0.0.2-r3081.ebuild
similarity index 88%
rename from chromeos-base/bootstat/bootstat-0.0.2-r3080.ebuild
rename to chromeos-base/bootstat/bootstat-0.0.2-r3081.ebuild
index 30f88c2..3b2a7da 100644
--- a/chromeos-base/bootstat/bootstat-0.0.2-r3080.ebuild
+++ b/chromeos-base/bootstat/bootstat-0.0.2-r3081.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8e460b4319aa509e57ba887ac56806030aa85ccd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8e460b4319aa509e57ba887ac56806030aa85ccd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/buffet/buffet-0.0.1-r2901.ebuild b/chromeos-base/buffet/buffet-0.0.1-r2902.ebuild
similarity index 91%
rename from chromeos-base/buffet/buffet-0.0.1-r2901.ebuild
rename to chromeos-base/buffet/buffet-0.0.1-r2902.ebuild
index c46ac4c..9d9a00c 100644
--- a/chromeos-base/buffet/buffet-0.0.1-r2901.ebuild
+++ b/chromeos-base/buffet/buffet-0.0.1-r2902.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "da25eefd3c0c9f59c7ef606fbc9c4ac8dacf0228" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "da25eefd3c0c9f59c7ef606fbc9c4ac8dacf0228" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/cbor/cbor-0.0.1-r74.ebuild b/chromeos-base/cbor/cbor-0.0.1-r75.ebuild
similarity index 89%
rename from chromeos-base/cbor/cbor-0.0.1-r74.ebuild
rename to chromeos-base/cbor/cbor-0.0.1-r75.ebuild
index 11a861cd..45f917d 100644
--- a/chromeos-base/cbor/cbor-0.0.1-r74.ebuild
+++ b/chromeos-base/cbor/cbor-0.0.1-r75.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "6ffaf0f4bc9506c53a50a8b90a0f44d08f62395b")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "44021ce5241d712ce75d8be72c55f0e61dde192b")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "6ffaf0f4bc9506c53a50a8b90a0f44d08f62395b")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "44021ce5241d712ce75d8be72c55f0e61dde192b")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"chromiumos/platform/cbor"
diff --git a/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r76.ebuild b/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r77.ebuild
similarity index 88%
rename from chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r76.ebuild
rename to chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r77.ebuild
index 8f66114..0a4bc62 100644
--- a/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r76.ebuild
+++ b/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r77.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "cb0770fe9b162f3437511fca1b23395c2a4758e9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "cb0770fe9b162f3437511fca1b23395c2a4758e9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/chaps/chaps-0.0.1-r3248.ebuild b/chromeos-base/chaps/chaps-0.0.1-r3249.ebuild
similarity index 96%
rename from chromeos-base/chaps/chaps-0.0.1-r3248.ebuild
rename to chromeos-base/chaps/chaps-0.0.1-r3249.ebuild
index 6cf06d1..87cf3f5 100644
--- a/chromeos-base/chaps/chaps-0.0.1-r3248.ebuild
+++ b/chromeos-base/chaps/chaps-0.0.1-r3249.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4b2d5b29c42d5d97536783fe2739031d18e01643"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0a71ef63088ea33468707e9a1c92496a285f83bf" "8b709631d01f33411578061c0dd8bc0a0b243694" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0a71ef63088ea33468707e9a1c92496a285f83bf" "8b709631d01f33411578061c0dd8bc0a0b243694" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r252.ebuild b/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r253.ebuild
similarity index 91%
rename from chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r252.ebuild
rename to chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r253.ebuild
index 1798995..5ab2268 100644
--- a/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r252.ebuild
+++ b/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r253.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "f2131ce9c8ad903ceb133ba94152c94b28643590" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "f2131ce9c8ad903ceb133ba94152c94b28643590" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1665.ebuild b/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1666.ebuild
similarity index 90%
rename from chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1665.ebuild
rename to chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1666.ebuild
index ad27da6..e7831e9 100644
--- a/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1665.ebuild
+++ b/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r1666.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="ca821c18f0d4e702204e0bea55bb627b9591a187"
-CROS_WORKON_TREE=("4fdfdbe461ccedeaaf176391c0bbb0f74943be45" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "316f9280ff87203d961bd29b773e08824f1c45d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ffa1c0c3843a18217b464be52d6253b57bb30f6a")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("4fdfdbe461ccedeaaf176391c0bbb0f74943be45" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ffa1c0c3843a18217b464be52d6253b57bb30f6a")
 CROS_WORKON_INCREMENTAL_BUILD=1
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-0.0.1-r2623.ebuild b/chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-0.0.1-r2624.ebuild
similarity index 88%
rename from chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-0.0.1-r2623.ebuild
rename to chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-0.0.1-r2624.ebuild
index 95e4d5f..532e516 100644
--- a/chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-0.0.1-r2623.ebuild
+++ b/chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-0.0.1-r2624.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "92b4a6734aabb6153326e870fb223663c8292b64" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "92b4a6734aabb6153326e870fb223663c8292b64" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4035.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4036.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4035.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4036.ebuild
index 765234a..c9bfab1 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4035.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4036.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("ca948d79a7030df97b8f4fea16292b60fa60fd03" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
-CROS_WORKON_TREE=("cdde90888d34b6a06a374e9e9788275762c25ecc" "32903f97edbef88a34223ca070e127065ee58332")
+CROS_WORKON_COMMIT=("57a42eb41ab26bca5d2edd6a3ff1ba2aaeb0fabf" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
+CROS_WORKON_TREE=("e9d5d519a92502a20a9fdade54fd25547a0ab8c6" "32903f97edbef88a34223ca070e127065ee58332")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8768.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8769.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8768.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8769.ebuild
index f7d7b48..c75052e 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8768.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8769.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("ca948d79a7030df97b8f4fea16292b60fa60fd03" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("cdde90888d34b6a06a374e9e9788275762c25ecc" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("57a42eb41ab26bca5d2edd6a3ff1ba2aaeb0fabf" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("e9d5d519a92502a20a9fdade54fd25547a0ab8c6" "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-r626.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r627.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r626.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r627.ebuild
index c4cf5e4..8a50e6d 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r626.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r627.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("ca948d79a7030df97b8f4fea16292b60fa60fd03" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("cdde90888d34b6a06a374e9e9788275762c25ecc" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("57a42eb41ab26bca5d2edd6a3ff1ba2aaeb0fabf" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("e9d5d519a92502a20a9fdade54fd25547a0ab8c6" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3099.ebuild b/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3100.ebuild
similarity index 89%
rename from chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3099.ebuild
rename to chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3100.ebuild
index 7aa5e8b..0de9a02 100644
--- a/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3099.ebuild
+++ b/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3100.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "5bb685cc7bac46b747661bbf7fdc73e737421c15" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5bb685cc7bac46b747661bbf7fdc73e737421c15" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4175.ebuild b/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4176.ebuild
similarity index 97%
rename from chromeos-base/chromeos-init/chromeos-init-0.0.25-r4175.ebuild
rename to chromeos-base/chromeos-init/chromeos-init-0.0.25-r4176.ebuild
index e560a07..2da70cb 100644
--- a/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4175.ebuild
+++ b/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4176.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "7e8d88b080c70040d59326fb054497faa35e5e79" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "7e8d88b080c70040d59326fb054497faa35e5e79" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r3441.ebuild b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3442.ebuild
similarity index 94%
rename from chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3441.ebuild
rename to chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3442.ebuild
index 2b43f81..f630eefc 100644
--- a/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3441.ebuild
+++ b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3442.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="a151c4fe59c6f0457ddd350a0c675a0f90a9e038"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a862c9a8f710bf1b2eb80a10f60f0486658693b8" "2b6d4230c92e83e39209823855064483eed04754" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "a862c9a8f710bf1b2eb80a10f60f0486658693b8" "2b6d4230c92e83e39209823855064483eed04754" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4557.ebuild b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4558.ebuild
similarity index 96%
rename from chromeos-base/chromeos-login/chromeos-login-0.0.2-r4557.ebuild
rename to chromeos-base/chromeos-login/chromeos-login-0.0.2-r4558.ebuild
index d8848c4..4a0caa0 100644
--- a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4557.ebuild
+++ b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r4558.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "316f9280ff87203d961bd29b773e08824f1c45d4" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "05f4e64492047e6a8147c9823ee1abed1f9128c3" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "05f4e64492047e6a8147c9823ee1abed1f9128c3" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r241.ebuild b/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r242.ebuild
similarity index 88%
rename from chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r241.ebuild
rename to chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r242.ebuild
index 99e7644..25d7f1e 100644
--- a/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r241.ebuild
+++ b/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r242.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8d5d5e575da16bb48f735ef93feedcfae4b1586e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8d5d5e575da16bb48f735ef93feedcfae4b1586e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1627.ebuild b/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1628.ebuild
similarity index 89%
rename from chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1627.ebuild
rename to chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1628.ebuild
index 6723e27..1867b45 100644
--- a/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1627.ebuild
+++ b/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1628.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "1e69ede3d074afd135fa6f2136ea5d99c425702b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "1e69ede3d074afd135fa6f2136ea5d99c425702b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/codelab/codelab-0.0.1-r124.ebuild b/chromeos-base/codelab/codelab-0.0.1-r125.ebuild
similarity index 84%
rename from chromeos-base/codelab/codelab-0.0.1-r124.ebuild
rename to chromeos-base/codelab/codelab-0.0.1-r125.ebuild
index 72b27ab..9cf763c 100644
--- a/chromeos-base/codelab/codelab-0.0.1-r124.ebuild
+++ b/chromeos-base/codelab/codelab-0.0.1-r125.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c8339e925dbb6132281f13d2df57ba1cad2d6a62" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c8339e925dbb6132281f13d2df57ba1cad2d6a62" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3455.ebuild b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3456.ebuild
similarity index 97%
rename from chromeos-base/crash-reporter/crash-reporter-0.0.1-r3455.ebuild
rename to chromeos-base/crash-reporter/crash-reporter-0.0.1-r3456.ebuild
index 4db495b..9e5d3ee 100644
--- a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3455.ebuild
+++ b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3456.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="3b6509662df140ad1f2f479d046ad822b2151c72"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c71eae0e49b06e2c9d98a41db13d8318465b7cf9" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c71eae0e49b06e2c9d98a41db13d8318465b7cf9" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r300.ebuild b/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r301.ebuild
similarity index 85%
rename from chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r300.ebuild
rename to chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r301.ebuild
index 7cf8f0f..374a43b 100644
--- a/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r300.ebuild
+++ b/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r301.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "871bb7e6654a823f1468a5857b4c74f12aaedbb5" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "871bb7e6654a823f1468a5857b4c74f12aaedbb5" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/tools common-mk"
diff --git a/chromeos-base/cros-camera/cros-camera-0.0.1-r786.ebuild b/chromeos-base/cros-camera/cros-camera-0.0.1-r787.ebuild
similarity index 91%
rename from chromeos-base/cros-camera/cros-camera-0.0.1-r786.ebuild
rename to chromeos-base/cros-camera/cros-camera-0.0.1-r787.ebuild
index 9e7410e..ce513ec 100644
--- a/chromeos-base/cros-camera/cros-camera-0.0.1-r786.ebuild
+++ b/chromeos-base/cros-camera/cros-camera-0.0.1-r787.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "272bb6870a0055478d49be7e00a33dbe072205c3" "108550b36339f46a9bb63727f9ff310df1e95c92" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "d5b4ebb3db391cf6bd70618e59daece7bef6ad20" "108550b36339f46a9bb63727f9ff310df1e95c92" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
 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-r3106.ebuild b/chromeos-base/cros-disks/cros-disks-0.0.1-r3107.ebuild
similarity index 96%
rename from chromeos-base/cros-disks/cros-disks-0.0.1-r3106.ebuild
rename to chromeos-base/cros-disks/cros-disks-0.0.1-r3107.ebuild
index b54c5d7..80ac3ad 100644
--- a/chromeos-base/cros-disks/cros-disks-0.0.1-r3106.ebuild
+++ b/chromeos-base/cros-disks/cros-disks-0.0.1-r3107.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="1df6417a41eac12f37ec1d66cd1bef18a14b81f1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "36de3e5a16e585887aea4478ab5af77e96853dc3" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "36de3e5a16e585887aea4478ab5af77e96853dc3" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r259.ebuild b/chromeos-base/crosdns/crosdns-0.0.1-r260.ebuild
similarity index 91%
rename from chromeos-base/crosdns/crosdns-0.0.1-r259.ebuild
rename to chromeos-base/crosdns/crosdns-0.0.1-r260.ebuild
index b97f0f5..f708e88 100644
--- a/chromeos-base/crosdns/crosdns-0.0.1-r259.ebuild
+++ b/chromeos-base/crosdns/crosdns-0.0.1-r260.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "09d4f564fd3af2f98535a78dcb18a9d60fbf12c7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "09d4f564fd3af2f98535a78dcb18a9d60fbf12c7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/croslog/croslog-0.0.1-r76.ebuild b/chromeos-base/croslog/croslog-0.0.1-r77.ebuild
similarity index 86%
rename from chromeos-base/croslog/croslog-0.0.1-r76.ebuild
rename to chromeos-base/croslog/croslog-0.0.1-r77.ebuild
index 6982b02..bd9384e 100644
--- a/chromeos-base/croslog/croslog-0.0.1-r76.ebuild
+++ b/chromeos-base/croslog/croslog-0.0.1-r77.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8fa9939ad3373da3aa1080b56644e815ce3b1e13" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8fa9939ad3373da3aa1080b56644e815ce3b1e13" "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-r1130.ebuild b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1131.ebuild
similarity index 89%
rename from chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1130.ebuild
rename to chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1131.ebuild
index 2d596e1..3629c50 100644
--- a/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1130.ebuild
+++ b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r1131.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cfcbf83ca747c14a0052fb28822f24ba01b2c083"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0692d85476ca6c7d99d06761df3ce1faed340384" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0692d85476ca6c7d99d06761df3ce1faed340384" "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-r964.ebuild b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r965.ebuild
similarity index 91%
rename from chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r964.ebuild
rename to chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r965.ebuild
index 1f84b72..fa6023a 100644
--- a/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r964.ebuild
+++ b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r965.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cfcbf83ca747c14a0052fb28822f24ba01b2c083"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0692d85476ca6c7d99d06761df3ce1faed340384" "4f428eceb77ddeae2a9cdbc99367fd321c975f15" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0692d85476ca6c7d99d06761df3ce1faed340384" "4f428eceb77ddeae2a9cdbc99367fd321c975f15" "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-r3483.ebuild b/chromeos-base/cryptohome/cryptohome-0.0.1-r3484.ebuild
similarity index 97%
rename from chromeos-base/cryptohome/cryptohome-0.0.1-r3483.ebuild
rename to chromeos-base/cryptohome/cryptohome-0.0.1-r3484.ebuild
index 5acf615..499353b 100644
--- a/chromeos-base/cryptohome/cryptohome-0.0.1-r3483.ebuild
+++ b/chromeos-base/cryptohome/cryptohome-0.0.1-r3484.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cfcbf83ca747c14a0052fb28822f24ba01b2c083"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0692d85476ca6c7d99d06761df3ce1faed340384" "989d840598227b15d78525d5f92c806011a9c158" "4f428eceb77ddeae2a9cdbc99367fd321c975f15" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0692d85476ca6c7d99d06761df3ce1faed340384" "989d840598227b15d78525d5f92c806011a9c158" "4f428eceb77ddeae2a9cdbc99367fd321c975f15" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/debugd-client/debugd-client-0.0.1-r1957.ebuild b/chromeos-base/debugd-client/debugd-client-0.0.1-r1958.ebuild
similarity index 90%
rename from chromeos-base/debugd-client/debugd-client-0.0.1-r1957.ebuild
rename to chromeos-base/debugd-client/debugd-client-0.0.1-r1958.ebuild
index 21b8e16..9248f1d 100644
--- a/chromeos-base/debugd-client/debugd-client-0.0.1-r1957.ebuild
+++ b/chromeos-base/debugd-client/debugd-client-0.0.1-r1958.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f767bac25bc9880fa0758d18f93962d04fad88c2"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e31835b2db28cdab9c6558f4495e2b706600d88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e31835b2db28cdab9c6558f4495e2b706600d88e" "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-r2971.ebuild b/chromeos-base/debugd/debugd-0.0.1-r2972.ebuild
similarity index 95%
rename from chromeos-base/debugd/debugd-0.0.1-r2971.ebuild
rename to chromeos-base/debugd/debugd-0.0.1-r2972.ebuild
index 489edb9..8d06555 100644
--- a/chromeos-base/debugd/debugd-0.0.1-r2971.ebuild
+++ b/chromeos-base/debugd/debugd-0.0.1-r2972.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f767bac25bc9880fa0758d18f93962d04fad88c2"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e31835b2db28cdab9c6558f4495e2b706600d88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e31835b2db28cdab9c6558f4495e2b706600d88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/dev-install/dev-install-0.0.1-r1199.ebuild b/chromeos-base/dev-install/dev-install-0.0.1-r1200.ebuild
similarity index 94%
rename from chromeos-base/dev-install/dev-install-0.0.1-r1199.ebuild
rename to chromeos-base/dev-install/dev-install-0.0.1-r1200.ebuild
index dcc3a5a..2cfba96 100644
--- a/chromeos-base/dev-install/dev-install-0.0.1-r1199.ebuild
+++ b/chromeos-base/dev-install/dev-install-0.0.1-r1200.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "502a8a422d806ada8ab91dece10e72d4ce63a77e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "502a8a422d806ada8ab91dece10e72d4ce63a77e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r566.ebuild b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r567.ebuild
similarity index 88%
rename from chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r566.ebuild
rename to chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r567.ebuild
index b7506c6..37580fd 100644
--- a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r566.ebuild
+++ b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r567.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="36356aadfbf2facc6fd0dfa45cc39defbcc5999f"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "d0d884cad5a42accc051eee650dc710732e2c842" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "d0d884cad5a42accc051eee650dc710732e2c842" "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-r875.ebuild b/chromeos-base/diagnostics/diagnostics-0.0.1-r876.ebuild
similarity index 96%
rename from chromeos-base/diagnostics/diagnostics-0.0.1-r875.ebuild
rename to chromeos-base/diagnostics/diagnostics-0.0.1-r876.ebuild
index b6d4e8d..2a87fc3 100644
--- a/chromeos-base/diagnostics/diagnostics-0.0.1-r875.ebuild
+++ b/chromeos-base/diagnostics/diagnostics-0.0.1-r876.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="36356aadfbf2facc6fd0dfa45cc39defbcc5999f"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "316f9280ff87203d961bd29b773e08824f1c45d4" "d0d884cad5a42accc051eee650dc710732e2c842" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "d0d884cad5a42accc051eee650dc710732e2c842" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/disk_updater/disk_updater-0.0.1-r3054.ebuild b/chromeos-base/disk_updater/disk_updater-0.0.1-r3055.ebuild
similarity index 90%
rename from chromeos-base/disk_updater/disk_updater-0.0.1-r3054.ebuild
rename to chromeos-base/disk_updater/disk_updater-0.0.1-r3055.ebuild
index 60bb661..4d75d38 100644
--- a/chromeos-base/disk_updater/disk_updater-0.0.1-r3054.ebuild
+++ b/chromeos-base/disk_updater/disk_updater-0.0.1-r3055.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a84edaa470edc69e27335f718e4784a8fcc883f9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "a84edaa470edc69e27335f718e4784a8fcc883f9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r401.ebuild b/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r402.ebuild
similarity index 88%
rename from chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r401.ebuild
rename to chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r402.ebuild
index 3ee31f6..44b57ec 100644
--- a/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r401.ebuild
+++ b/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r402.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="73ceddb3e5e63012c6b9abc07747c90a0b13c489"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "109cca3a31fda5ec20f8d3d9b2dab3bb9008a708" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "109cca3a31fda5ec20f8d3d9b2dab3bb9008a708" "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-r485.ebuild b/chromeos-base/dlcservice/dlcservice-0.0.1-r486.ebuild
similarity index 93%
rename from chromeos-base/dlcservice/dlcservice-0.0.1-r485.ebuild
rename to chromeos-base/dlcservice/dlcservice-0.0.1-r486.ebuild
index de8a339..ba09116 100644
--- a/chromeos-base/dlcservice/dlcservice-0.0.1-r485.ebuild
+++ b/chromeos-base/dlcservice/dlcservice-0.0.1-r486.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="73ceddb3e5e63012c6b9abc07747c90a0b13c489"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "109cca3a31fda5ec20f8d3d9b2dab3bb9008a708" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "109cca3a31fda5ec20f8d3d9b2dab3bb9008a708" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/easy-unlock/easy-unlock-0.0.1-r2954.ebuild b/chromeos-base/easy-unlock/easy-unlock-0.0.1-r2955.ebuild
similarity index 91%
rename from chromeos-base/easy-unlock/easy-unlock-0.0.1-r2954.ebuild
rename to chromeos-base/easy-unlock/easy-unlock-0.0.1-r2955.ebuild
index 93843f4..1a179b3 100644
--- a/chromeos-base/easy-unlock/easy-unlock-0.0.1-r2954.ebuild
+++ b/chromeos-base/easy-unlock/easy-unlock-0.0.1-r2955.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "ef83a68e71f0fc4deac90a21a6a5e93412707ca8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ef83a68e71f0fc4deac90a21a6a5e93412707ca8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6774.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6775.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r6774.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r6775.ebuild
index 8aed053..6b6f1f3 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6774.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6775.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="ca948d79a7030df97b8f4fea16292b60fa60fd03"
-CROS_WORKON_TREE="cdde90888d34b6a06a374e9e9788275762c25ecc"
+CROS_WORKON_COMMIT="57a42eb41ab26bca5d2edd6a3ff1ba2aaeb0fabf"
+CROS_WORKON_TREE="e9d5d519a92502a20a9fdade54fd25547a0ab8c6"
 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-r5878.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5879.ebuild
similarity index 87%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5878.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5879.ebuild
index 3865928..d9a9eae 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5878.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5879.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="ca948d79a7030df97b8f4fea16292b60fa60fd03"
-CROS_WORKON_TREE="cdde90888d34b6a06a374e9e9788275762c25ecc"
+CROS_WORKON_COMMIT="57a42eb41ab26bca5d2edd6a3ff1ba2aaeb0fabf"
+CROS_WORKON_TREE="e9d5d519a92502a20a9fdade54fd25547a0ab8c6"
 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-r8707.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r8708.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r8707.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r8708.ebuild
index 08a5de3..544411f 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r8707.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r8708.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="ca948d79a7030df97b8f4fea16292b60fa60fd03"
-CROS_WORKON_TREE="cdde90888d34b6a06a374e9e9788275762c25ecc"
+CROS_WORKON_COMMIT="57a42eb41ab26bca5d2edd6a3ff1ba2aaeb0fabf"
+CROS_WORKON_TREE="e9d5d519a92502a20a9fdade54fd25547a0ab8c6"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/factory-mini/factory-mini-0.0.1-r1999.ebuild b/chromeos-base/factory-mini/factory-mini-0.0.1-r2000.ebuild
similarity index 95%
rename from chromeos-base/factory-mini/factory-mini-0.0.1-r1999.ebuild
rename to chromeos-base/factory-mini/factory-mini-0.0.1-r2000.ebuild
index 157544c..71fe89d 100644
--- a/chromeos-base/factory-mini/factory-mini-0.0.1-r1999.ebuild
+++ b/chromeos-base/factory-mini/factory-mini-0.0.1-r2000.ebuild
@@ -15,8 +15,8 @@
 # from /usr/local/bin to that file.
 
 EAPI=7
-CROS_WORKON_COMMIT="80e779e786c5b158ed7a4471da8f778aacd4e4fe"
-CROS_WORKON_TREE="2b425026a03e714db98ffc19342f79cb8de71391"
+CROS_WORKON_COMMIT="2a48c185a385e0697e58a24878eeb6bbc5d5c864"
+CROS_WORKON_TREE="6075e42bf77b4adb77c126d4c687251582f398fc"
 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-r1928.ebuild b/chromeos-base/factory/factory-0.2.0-r1929.ebuild
similarity index 93%
rename from chromeos-base/factory/factory-0.2.0-r1928.ebuild
rename to chromeos-base/factory/factory-0.2.0-r1929.ebuild
index 79b4bd0..4e2e4d3 100644
--- a/chromeos-base/factory/factory-0.2.0-r1928.ebuild
+++ b/chromeos-base/factory/factory-0.2.0-r1929.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="80e779e786c5b158ed7a4471da8f778aacd4e4fe"
-CROS_WORKON_TREE="2b425026a03e714db98ffc19342f79cb8de71391"
+CROS_WORKON_COMMIT="2a48c185a385e0697e58a24878eeb6bbc5d5c864"
+CROS_WORKON_TREE="6075e42bf77b4adb77c126d4c687251582f398fc"
 CROS_WORKON_PROJECT="chromiumos/platform/factory"
 CROS_WORKON_LOCALNAME="platform/factory"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/feedback/feedback-0.0.1-r789.ebuild b/chromeos-base/feedback/feedback-0.0.1-r790.ebuild
similarity index 90%
rename from chromeos-base/feedback/feedback-0.0.1-r789.ebuild
rename to chromeos-base/feedback/feedback-0.0.1-r790.ebuild
index 395ef06..63f2fca 100644
--- a/chromeos-base/feedback/feedback-0.0.1-r789.ebuild
+++ b/chromeos-base/feedback/feedback-0.0.1-r790.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "b399a0f83e8fc7e86fd5b4d72781fee7f2598f1a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "b399a0f83e8fc7e86fd5b4d72781fee7f2598f1a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r29.ebuild b/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r30.ebuild
similarity index 87%
rename from chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r29.ebuild
rename to chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r30.ebuild
index b3e2a1b..da6df6a 100644
--- a/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r29.ebuild
+++ b/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r30.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "6b587aaada80ee2933381273c81abeeae91ff0ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "6b587aaada80ee2933381273c81abeeae91ff0ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/g2f_tools/g2f_tools-0.0.1-r428.ebuild b/chromeos-base/g2f_tools/g2f_tools-0.0.1-r429.ebuild
similarity index 90%
rename from chromeos-base/g2f_tools/g2f_tools-0.0.1-r428.ebuild
rename to chromeos-base/g2f_tools/g2f_tools-0.0.1-r429.ebuild
index 6206140..427f10f 100644
--- a/chromeos-base/g2f_tools/g2f_tools-0.0.1-r428.ebuild
+++ b/chromeos-base/g2f_tools/g2f_tools-0.0.1-r429.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "20ed8021024637e492670d20fa5969a2ad75e4b6" "bac582e24e715a9bb440cd200c6194a45b704591" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "20ed8021024637e492670d20fa5969a2ad75e4b6" "bac582e24e715a9bb440cd200c6194a45b704591" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/glib-bridge/glib-bridge-0.0.1-r174.ebuild b/chromeos-base/glib-bridge/glib-bridge-0.0.1-r175.ebuild
similarity index 88%
rename from chromeos-base/glib-bridge/glib-bridge-0.0.1-r174.ebuild
rename to chromeos-base/glib-bridge/glib-bridge-0.0.1-r175.ebuild
index 4b94477..acf92a6 100644
--- a/chromeos-base/glib-bridge/glib-bridge-0.0.1-r174.ebuild
+++ b/chromeos-base/glib-bridge/glib-bridge-0.0.1-r175.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0477fd01ac7704e38511a9cccaa4b4c3377ba146" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0477fd01ac7704e38511a9cccaa4b4c3377ba146" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/goldfishd/goldfishd-0.0.1-r481.ebuild b/chromeos-base/goldfishd/goldfishd-0.0.1-r482.ebuild
similarity index 86%
rename from chromeos-base/goldfishd/goldfishd-0.0.1-r481.ebuild
rename to chromeos-base/goldfishd/goldfishd-0.0.1-r482.ebuild
index e4e84f1..4b95b6a 100644
--- a/chromeos-base/goldfishd/goldfishd-0.0.1-r481.ebuild
+++ b/chromeos-base/goldfishd/goldfishd-0.0.1-r482.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "639a8c5a575a0d7908a87bf99839c62c8af18e2b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "639a8c5a575a0d7908a87bf99839c62c8af18e2b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r530.ebuild b/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r531.ebuild
similarity index 90%
rename from chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r530.ebuild
rename to chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r531.ebuild
index d02aa30..b5aa17f 100644
--- a/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r530.ebuild
+++ b/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r531.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "b21c201bb53f360e527e5cc69ddcc4c81114533b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "b21c201bb53f360e527e5cc69ddcc4c81114533b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/hammerd/hammerd-0.0.1-r992.ebuild b/chromeos-base/hammerd/hammerd-0.0.1-r993.ebuild
similarity index 92%
rename from chromeos-base/hammerd/hammerd-0.0.1-r992.ebuild
rename to chromeos-base/hammerd/hammerd-0.0.1-r993.ebuild
index dbad7c9..ededc41 100644
--- a/chromeos-base/hammerd/hammerd-0.0.1-r992.ebuild
+++ b/chromeos-base/hammerd/hammerd-0.0.1-r993.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "b21c201bb53f360e527e5cc69ddcc4c81114533b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "b21c201bb53f360e527e5cc69ddcc4c81114533b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r202.ebuild b/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r203.ebuild
similarity index 89%
rename from chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r202.ebuild
rename to chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r203.ebuild
index e1f1016..4885bd5 100644
--- a/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r202.ebuild
+++ b/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r203.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "580e5f512f707afbf93a05e1bfc01b7413e8a60f" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "580e5f512f707afbf93a05e1bfc01b7413e8a60f" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r103.ebuild b/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r104.ebuild
similarity index 88%
rename from chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r103.ebuild
rename to chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r104.ebuild
index af97a9d..83c4c89 100644
--- a/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r103.ebuild
+++ b/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r104.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "580e5f512f707afbf93a05e1bfc01b7413e8a60f" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "580e5f512f707afbf93a05e1bfc01b7413e8a60f" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/hardware_verifier/..."
 )
diff --git a/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r132.ebuild b/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r133.ebuild
similarity index 88%
rename from chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r132.ebuild
rename to chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r133.ebuild
index 4f2806d..13320f8 100644
--- a/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r132.ebuild
+++ b/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r133.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4b2d5b29c42d5d97536783fe2739031d18e01643"
-CROS_WORKON_TREE=("ce56867041fe9945411df177d9792c8381e049e5" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "440c9a42cb30ba5f0e166167b91ba54b8a8f437c" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("ce56867041fe9945411df177d9792c8381e049e5" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "440c9a42cb30ba5f0e166167b91ba54b8a8f437c" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/iioservice/iioservice-0.0.1-r79.ebuild b/chromeos-base/iioservice/iioservice-0.0.1-r80.ebuild
similarity index 91%
rename from chromeos-base/iioservice/iioservice-0.0.1-r79.ebuild
rename to chromeos-base/iioservice/iioservice-0.0.1-r80.ebuild
index 90fe393..30b1fa9 100644
--- a/chromeos-base/iioservice/iioservice-0.0.1-r79.ebuild
+++ b/chromeos-base/iioservice/iioservice-0.0.1-r80.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "53751c9a95397ae0542f14eedaa997c3cb3f9078" "cc73b66310636a1163f40ed35f934598ce449e52" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "53751c9a95397ae0542f14eedaa997c3cb3f9078" "cc73b66310636a1163f40ed35f934598ce449e52" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 # TODO(crbug.com/809389): Remove libmems from this list.
diff --git a/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r24.ebuild b/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r25.ebuild
similarity index 87%
rename from chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r24.ebuild
rename to chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r25.ebuild
index b49e132..7378976 100644
--- a/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r24.ebuild
+++ b/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r25.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "53751c9a95397ae0542f14eedaa997c3cb3f9078" "cc73b66310636a1163f40ed35f934598ce449e52" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "53751c9a95397ae0542f14eedaa997c3cb3f9078" "cc73b66310636a1163f40ed35f934598ce449e52" "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-r601.ebuild b/chromeos-base/imageloader-client/imageloader-client-0.0.1-r602.ebuild
similarity index 89%
rename from chromeos-base/imageloader-client/imageloader-client-0.0.1-r601.ebuild
rename to chromeos-base/imageloader-client/imageloader-client-0.0.1-r602.ebuild
index db95942..52b4bfc 100644
--- a/chromeos-base/imageloader-client/imageloader-client-0.0.1-r601.ebuild
+++ b/chromeos-base/imageloader-client/imageloader-client-0.0.1-r602.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a69ccb0af9f1534326c864d2e43e8021d0a62245" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "a69ccb0af9f1534326c864d2e43e8021d0a62245" "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-r1559.ebuild b/chromeos-base/imageloader/imageloader-0.0.1-r1560.ebuild
similarity index 93%
rename from chromeos-base/imageloader/imageloader-0.0.1-r1559.ebuild
rename to chromeos-base/imageloader/imageloader-0.0.1-r1560.ebuild
index 414694f..6ba4ade 100644
--- a/chromeos-base/imageloader/imageloader-0.0.1-r1559.ebuild
+++ b/chromeos-base/imageloader/imageloader-0.0.1-r1560.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a69ccb0af9f1534326c864d2e43e8021d0a62245" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "a69ccb0af9f1534326c864d2e43e8021d0a62245" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/ippusb_manager/ippusb_manager-0.0.1-r342.ebuild b/chromeos-base/ippusb_manager/ippusb_manager-0.0.1-r343.ebuild
similarity index 91%
rename from chromeos-base/ippusb_manager/ippusb_manager-0.0.1-r342.ebuild
rename to chromeos-base/ippusb_manager/ippusb_manager-0.0.1-r343.ebuild
index 433f6f9..6989603 100644
--- a/chromeos-base/ippusb_manager/ippusb_manager-0.0.1-r342.ebuild
+++ b/chromeos-base/ippusb_manager/ippusb_manager-0.0.1-r343.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "3dbd85f43fb55bdce2d3c7c6303e360189727eee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "3dbd85f43fb55bdce2d3c7c6303e360189727eee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/kerberos/kerberos-0.0.1-r272.ebuild b/chromeos-base/kerberos/kerberos-0.0.1-r273.ebuild
similarity index 94%
rename from chromeos-base/kerberos/kerberos-0.0.1-r272.ebuild
rename to chromeos-base/kerberos/kerberos-0.0.1-r273.ebuild
index 478c97b..8b30b93 100644
--- a/chromeos-base/kerberos/kerberos-0.0.1-r272.ebuild
+++ b/chromeos-base/kerberos/kerberos-0.0.1-r273.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "2732487a36d2401688425aac7a50e241ac208d3d" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "2732487a36d2401688425aac7a50e241ac208d3d" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r42.ebuild b/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r43.ebuild
similarity index 88%
rename from chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r42.ebuild
rename to chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r43.ebuild
index 863c3bd..ff827d8 100644
--- a/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r42.ebuild
+++ b/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r43.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "f131d8f851366e6a2f8e8fa8f3042285d021d6c6")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4c04b0ebf35112629d2f6bc7e478514dcb5805cb")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "f131d8f851366e6a2f8e8fa8f3042285d021d6c6")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4c04b0ebf35112629d2f6bc7e478514dcb5805cb")
 CROS_WORKON_LOCALNAME=("platform2" "third_party/lexmark-fax-pnh")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/lexmark-fax-pnh")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/lexmark-fax-pnh")
diff --git a/chromeos-base/libbrillo/libbrillo-0.0.1-r1750.ebuild b/chromeos-base/libbrillo/libbrillo-0.0.1-r1751.ebuild
similarity index 95%
rename from chromeos-base/libbrillo/libbrillo-0.0.1-r1750.ebuild
rename to chromeos-base/libbrillo/libbrillo-0.0.1-r1751.ebuild
index 513cb80..765a9bf 100644
--- a/chromeos-base/libbrillo/libbrillo-0.0.1-r1750.ebuild
+++ b/chromeos-base/libbrillo/libbrillo-0.0.1-r1751.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="af2fe252bed3130cd6d5137b6c1969193f810ff1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a0830d2676185cf91726c060c3d9b5c08b3e60da" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "a0830d2676185cf91726c060c3d9b5c08b3e60da" "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-r115.ebuild b/chromeos-base/libchrome/libchrome-0.0.1-r116.ebuild
similarity index 97%
rename from chromeos-base/libchrome/libchrome-0.0.1-r115.ebuild
rename to chromeos-base/libchrome/libchrome-0.0.1-r116.ebuild
index 5842107..b3facee 100644
--- a/chromeos-base/libchrome/libchrome-0.0.1-r115.ebuild
+++ b/chromeos-base/libchrome/libchrome-0.0.1-r116.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT=("36356aadfbf2facc6fd0dfa45cc39defbcc5999f" "a61582981ab348c73a8c596944b0e0a90a370529")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "d052a45b1769a766e6604127019ac12804d7452f")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "a61582981ab348c73a8c596944b0e0a90a370529")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "d052a45b1769a766e6604127019ac12804d7452f")
 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/libchromeos-ui/libchromeos-ui-0.0.1-r1778.ebuild b/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1779.ebuild
similarity index 89%
rename from chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1778.ebuild
rename to chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1779.ebuild
index c08098c..7e2ce2e 100644
--- a/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1778.ebuild
+++ b/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1779.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="71e70af5663a9b59ac506e207c9169bba1c601d2"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "01471fe321e7be48397d556f5b9a51e4f5d243a7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "01471fe321e7be48397d556f5b9a51e4f5d243a7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libcontainer/libcontainer-0.0.1-r1541.ebuild b/chromeos-base/libcontainer/libcontainer-0.0.1-r1542.ebuild
similarity index 89%
rename from chromeos-base/libcontainer/libcontainer-0.0.1-r1541.ebuild
rename to chromeos-base/libcontainer/libcontainer-0.0.1-r1542.ebuild
index 9912330..77d2f5f 100644
--- a/chromeos-base/libcontainer/libcontainer-0.0.1-r1541.ebuild
+++ b/chromeos-base/libcontainer/libcontainer-0.0.1-r1542.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/libhwsec/libhwsec-0.0.1-r146.ebuild b/chromeos-base/libhwsec/libhwsec-0.0.1-r147.ebuild
similarity index 91%
rename from chromeos-base/libhwsec/libhwsec-0.0.1-r146.ebuild
rename to chromeos-base/libhwsec/libhwsec-0.0.1-r147.ebuild
index 570cca7..efe401c 100644
--- a/chromeos-base/libhwsec/libhwsec-0.0.1-r146.ebuild
+++ b/chromeos-base/libhwsec/libhwsec-0.0.1-r147.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "989d840598227b15d78525d5f92c806011a9c158" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "989d840598227b15d78525d5f92c806011a9c158" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r78.ebuild b/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r79.ebuild
similarity index 82%
rename from chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r78.ebuild
rename to chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r79.ebuild
index bf18c24..c8464f6 100644
--- a/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r78.ebuild
+++ b/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r79.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "53751c9a95397ae0542f14eedaa997c3cb3f9078" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "53751c9a95397ae0542f14eedaa997c3cb3f9078" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn iioservice common-mk"
diff --git a/chromeos-base/libipp/libipp-0.0.1-r125.ebuild b/chromeos-base/libipp/libipp-0.0.1-r126.ebuild
similarity index 89%
rename from chromeos-base/libipp/libipp-0.0.1-r125.ebuild
rename to chromeos-base/libipp/libipp-0.0.1-r126.ebuild
index 1d82b3a..b269a3d 100644
--- a/chromeos-base/libipp/libipp-0.0.1-r125.ebuild
+++ b/chromeos-base/libipp/libipp-0.0.1-r126.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a30c13fe33c247bd5cbff62b4e1c55d0efbf759b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "a30c13fe33c247bd5cbff62b4e1c55d0efbf759b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libmems/libmems-0.0.1-r154.ebuild b/chromeos-base/libmems/libmems-0.0.1-r155.ebuild
similarity index 90%
rename from chromeos-base/libmems/libmems-0.0.1-r154.ebuild
rename to chromeos-base/libmems/libmems-0.0.1-r155.ebuild
index a79763e..a5daf50 100644
--- a/chromeos-base/libmems/libmems-0.0.1-r154.ebuild
+++ b/chromeos-base/libmems/libmems-0.0.1-r155.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "cc73b66310636a1163f40ed35f934598ce449e52" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "cc73b66310636a1163f40ed35f934598ce449e52" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r415.ebuild b/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r416.ebuild
similarity index 92%
rename from chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r415.ebuild
rename to chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r416.ebuild
index d046b43..363b9b9 100644
--- a/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r415.ebuild
+++ b/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r416.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r266.ebuild b/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r267.ebuild
similarity index 92%
rename from chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r266.ebuild
rename to chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r267.ebuild
index 12331d7..760caf3 100644
--- a/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r266.ebuild
+++ b/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r267.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4b2d5b29c42d5d97536783fe2739031d18e01643"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r184.ebuild b/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r185.ebuild
similarity index 87%
rename from chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r184.ebuild
rename to chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r185.ebuild
index 13e6eb3..f6616ac 100644
--- a/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r184.ebuild
+++ b/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r185.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "bd91d4dda730096c1dbff28a0275c03eee218eca" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "bd91d4dda730096c1dbff28a0275c03eee218eca" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libvda/libvda-0.0.1-r190.ebuild b/chromeos-base/libvda/libvda-0.0.1-r191.ebuild
similarity index 89%
rename from chromeos-base/libvda/libvda-0.0.1-r190.ebuild
rename to chromeos-base/libvda/libvda-0.0.1-r191.ebuild
index 72988db..db83c55 100644
--- a/chromeos-base/libvda/libvda-0.0.1-r190.ebuild
+++ b/chromeos-base/libvda/libvda-0.0.1-r191.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "bd91d4dda730096c1dbff28a0275c03eee218eca" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "bd91d4dda730096c1dbff28a0275c03eee218eca" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libweave/libweave-0.0.1-r1265.ebuild b/chromeos-base/libweave/libweave-0.0.1-r1266.ebuild
similarity index 90%
rename from chromeos-base/libweave/libweave-0.0.1-r1265.ebuild
rename to chromeos-base/libweave/libweave-0.0.1-r1266.ebuild
index c2d65e2..ee2bc1b 100644
--- a/chromeos-base/libweave/libweave-0.0.1-r1265.ebuild
+++ b/chromeos-base/libweave/libweave-0.0.1-r1266.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "9060831133ffb21d26641018be667b36a449b86a")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "be6429aaf7e01d2681cb9c8fee7ed73703282382")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "9060831133ffb21d26641018be667b36a449b86a")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "be6429aaf7e01d2681cb9c8fee7ed73703282382")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME=("platform2" "weave/libweave")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "weave/libweave")
diff --git a/chromeos-base/lorgnette/lorgnette-0.0.1-r2978.ebuild b/chromeos-base/lorgnette/lorgnette-0.0.1-r2979.ebuild
similarity index 92%
rename from chromeos-base/lorgnette/lorgnette-0.0.1-r2978.ebuild
rename to chromeos-base/lorgnette/lorgnette-0.0.1-r2979.ebuild
index 4c0aed5..025427e 100644
--- a/chromeos-base/lorgnette/lorgnette-0.0.1-r2978.ebuild
+++ b/chromeos-base/lorgnette/lorgnette-0.0.1-r2979.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "be79862e1d09cb59dbae2ff2a8b318ca1a4c132e" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "be79862e1d09cb59dbae2ff2a8b318ca1a4c132e" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r99.ebuild b/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r100.ebuild
similarity index 85%
rename from chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r99.ebuild
rename to chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r100.ebuild
index 5a75d63..0f49804 100644
--- a/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r99.ebuild
+++ b/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r100.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "be79862e1d09cb59dbae2ff2a8b318ca1a4c132e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "be79862e1d09cb59dbae2ff2a8b318ca1a4c132e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/manatee-client/manatee-client-0.0.1-r13.ebuild b/chromeos-base/manatee-client/manatee-client-0.0.1-r14.ebuild
similarity index 85%
rename from chromeos-base/manatee-client/manatee-client-0.0.1-r13.ebuild
rename to chromeos-base/manatee-client/manatee-client-0.0.1-r14.ebuild
index d3cf8da..1482e5a 100644
--- a/chromeos-base/manatee-client/manatee-client-0.0.1-r13.ebuild
+++ b/chromeos-base/manatee-client/manatee-client-0.0.1-r14.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="af2fe252bed3130cd6d5137b6c1969193f810ff1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0c7bf17cefa7e4919d532c5260135c5c9f73a30f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0c7bf17cefa7e4919d532c5260135c5c9f73a30f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/mcastd/mcastd-0.0.1-r156.ebuild b/chromeos-base/mcastd/mcastd-0.0.1-r157.ebuild
similarity index 86%
rename from chromeos-base/mcastd/mcastd-0.0.1-r156.ebuild
rename to chromeos-base/mcastd/mcastd-0.0.1-r157.ebuild
index 2e00d5d..530a885 100644
--- a/chromeos-base/mcastd/mcastd-0.0.1-r156.ebuild
+++ b/chromeos-base/mcastd/mcastd-0.0.1-r157.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="378930a07756755517375d7af854d2bb817df674"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "9c62af8f7fea27d1b7037ecccc01bc24d9ae4ee8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "9c62af8f7fea27d1b7037ecccc01bc24d9ae4ee8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/memd/memd-0.1.0-r61.ebuild b/chromeos-base/memd/memd-0.1.0-r62.ebuild
similarity index 88%
rename from chromeos-base/memd/memd-0.1.0-r61.ebuild
rename to chromeos-base/memd/memd-0.1.0-r62.ebuild
index 900e1e7..961991b 100644
--- a/chromeos-base/memd/memd-0.1.0-r61.ebuild
+++ b/chromeos-base/memd/memd-0.1.0-r62.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="178d940c8fa20666117208b3a6e40ed28579f122"
-CROS_WORKON_TREE=("f6601370d273ede0bc6b3a93a4211ab90c98ebdc" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("f6601370d273ede0bc6b3a93a4211ab90c98ebdc" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_RUST_SUBDIR="metrics/memd"
 
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/mems_setup/mems_setup-0.0.1-r185.ebuild b/chromeos-base/mems_setup/mems_setup-0.0.1-r186.ebuild
similarity index 89%
rename from chromeos-base/mems_setup/mems_setup-0.0.1-r185.ebuild
rename to chromeos-base/mems_setup/mems_setup-0.0.1-r186.ebuild
index 4b57e76..d7ac9b0 100644
--- a/chromeos-base/mems_setup/mems_setup-0.0.1-r185.ebuild
+++ b/chromeos-base/mems_setup/mems_setup-0.0.1-r186.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "0c7040ac2d229757a655b34dc2f89a66d88beff4" "cc73b66310636a1163f40ed35f934598ce449e52" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "0c7040ac2d229757a655b34dc2f89a66d88beff4" "cc73b66310636a1163f40ed35f934598ce449e52" "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-r3201.ebuild b/chromeos-base/metrics/metrics-0.0.1-r3202.ebuild
similarity index 95%
rename from chromeos-base/metrics/metrics-0.0.1-r3201.ebuild
rename to chromeos-base/metrics/metrics-0.0.1-r3202.ebuild
index 76a5fab..2a98599 100644
--- a/chromeos-base/metrics/metrics-0.0.1-r3201.ebuild
+++ b/chromeos-base/metrics/metrics-0.0.1-r3202.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/midis/midis-0.0.1-r1125.ebuild b/chromeos-base/midis/midis-0.0.1-r1126.ebuild
similarity index 93%
rename from chromeos-base/midis/midis-0.0.1-r1125.ebuild
rename to chromeos-base/midis/midis-0.0.1-r1126.ebuild
index 3985af8..eb039a0 100644
--- a/chromeos-base/midis/midis-0.0.1-r1125.ebuild
+++ b/chromeos-base/midis/midis-0.0.1-r1126.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "12cd47baf58eab10f40e9dea81b4d4ba450a69be" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "12cd47baf58eab10f40e9dea81b4d4ba450a69be" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/minios/minios-0.0.1-r1.ebuild b/chromeos-base/minios/minios-0.0.1-r2.ebuild
similarity index 84%
rename from chromeos-base/minios/minios-0.0.1-r1.ebuild
rename to chromeos-base/minios/minios-0.0.1-r2.ebuild
index 365a664..fb0a46e 100644
--- a/chromeos-base/minios/minios-0.0.1-r1.ebuild
+++ b/chromeos-base/minios/minios-0.0.1-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="df08dfaddce3638f899ba5ffffaf8994049a3c55"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "d9218471781789d46487f787906a3152f40554c4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "d9218471781789d46487f787906a3152f40554c4" "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-r3038.ebuild b/chromeos-base/mist/mist-0.0.1-r3039.ebuild
similarity index 89%
rename from chromeos-base/mist/mist-0.0.1-r3038.ebuild
rename to chromeos-base/mist/mist-0.0.1-r3039.ebuild
index 46af0db..a00ab87 100644
--- a/chromeos-base/mist/mist-0.0.1-r3038.ebuild
+++ b/chromeos-base/mist/mist-0.0.1-r3039.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694" "819df31f145c1b256b5a9753dc4fc2f6681f020c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "819df31f145c1b256b5a9753dc4fc2f6681f020c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r63.ebuild b/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r64.ebuild
similarity index 86%
rename from chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r63.ebuild
rename to chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r64.ebuild
index 0fb9fe1..000b18c 100644
--- a/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r63.ebuild
+++ b/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r64.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="563c94ce42d4c4e3fae9f9286e20e52c708390c6"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "b0594df587e27bf992a07f2f2ebe4f6b24f19921" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "b0594df587e27bf992a07f2f2ebe4f6b24f19921" "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-r122.ebuild b/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r123.ebuild
similarity index 88%
rename from chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r122.ebuild
rename to chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r123.ebuild
index 6468e89..c76f5d6 100644
--- a/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r122.ebuild
+++ b/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r123.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="563c94ce42d4c4e3fae9f9286e20e52c708390c6"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c58b76a89fc9862c107de270fa5dae543d1e67ce" "b0594df587e27bf992a07f2f2ebe4f6b24f19921" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c58b76a89fc9862c107de270fa5dae543d1e67ce" "b0594df587e27bf992a07f2f2ebe4f6b24f19921" "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-r428.ebuild b/chromeos-base/ml/ml-0.0.1-r429.ebuild
similarity index 96%
rename from chromeos-base/ml/ml-0.0.1-r428.ebuild
rename to chromeos-base/ml/ml-0.0.1-r429.ebuild
index cb3533d..f9992df 100644
--- a/chromeos-base/ml/ml-0.0.1-r428.ebuild
+++ b/chromeos-base/ml/ml-0.0.1-r429.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="563c94ce42d4c4e3fae9f9286e20e52c708390c6"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c58b76a89fc9862c107de270fa5dae543d1e67ce" "b0594df587e27bf992a07f2f2ebe4f6b24f19921" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c58b76a89fc9862c107de270fa5dae543d1e67ce" "b0594df587e27bf992a07f2f2ebe4f6b24f19921" "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/modemfwd/modemfwd-0.0.1-r762.ebuild b/chromeos-base/modemfwd/modemfwd-0.0.1-r763.ebuild
similarity index 91%
rename from chromeos-base/modemfwd/modemfwd-0.0.1-r762.ebuild
rename to chromeos-base/modemfwd/modemfwd-0.0.1-r763.ebuild
index 440d234..574450e 100644
--- a/chromeos-base/modemfwd/modemfwd-0.0.1-r762.ebuild
+++ b/chromeos-base/modemfwd/modemfwd-0.0.1-r763.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "316f9280ff87203d961bd29b773e08824f1c45d4" "8f2c541e74220acf60cf28e305a1fe749ad570f1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "8f2c541e74220acf60cf28e305a1fe749ad570f1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r439.ebuild b/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r440.ebuild
similarity index 87%
rename from chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r439.ebuild
rename to chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r440.ebuild
index ad30034..9feb0a9 100644
--- a/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r439.ebuild
+++ b/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r440.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "91ed93de800fd44b5a827d11ee8c6bde260fe458" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "91ed93de800fd44b5a827d11ee8c6bde260fe458" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/mri_package/mri_package-0.0.1-r256.ebuild b/chromeos-base/mri_package/mri_package-0.0.1-r257.ebuild
similarity index 91%
rename from chromeos-base/mri_package/mri_package-0.0.1-r256.ebuild
rename to chromeos-base/mri_package/mri_package-0.0.1-r257.ebuild
index f900612..d260755 100644
--- a/chromeos-base/mri_package/mri_package-0.0.1-r256.ebuild
+++ b/chromeos-base/mri_package/mri_package-0.0.1-r257.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "87be4a0f1a6437cb36a91c9816d2d66f2718b6b0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "87be4a0f1a6437cb36a91c9816d2d66f2718b6b0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_SUBTREE="common-mk media_perception .gn"
diff --git a/chromeos-base/mtpd/mtpd-0.0.1-r893.ebuild b/chromeos-base/mtpd/mtpd-0.0.1-r894.ebuild
similarity index 91%
rename from chromeos-base/mtpd/mtpd-0.0.1-r893.ebuild
rename to chromeos-base/mtpd/mtpd-0.0.1-r894.ebuild
index 34ee5fd..0252407 100644
--- a/chromeos-base/mtpd/mtpd-0.0.1-r893.ebuild
+++ b/chromeos-base/mtpd/mtpd-0.0.1-r894.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "687fa4fa888a9258a15947e2468f5427bd1b90dd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "687fa4fa888a9258a15947e2468f5427bd1b90dd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/ndproxyd/ndproxyd-0.0.1-r156.ebuild b/chromeos-base/ndproxyd/ndproxyd-0.0.1-r157.ebuild
similarity index 86%
rename from chromeos-base/ndproxyd/ndproxyd-0.0.1-r156.ebuild
rename to chromeos-base/ndproxyd/ndproxyd-0.0.1-r157.ebuild
index dc18e57..4cc7807 100644
--- a/chromeos-base/ndproxyd/ndproxyd-0.0.1-r156.ebuild
+++ b/chromeos-base/ndproxyd/ndproxyd-0.0.1-r157.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="378930a07756755517375d7af854d2bb817df674"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "9c62af8f7fea27d1b7037ecccc01bc24d9ae4ee8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "9c62af8f7fea27d1b7037ecccc01bc24d9ae4ee8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/nnapi/nnapi-0.0.1-r104.ebuild b/chromeos-base/nnapi/nnapi-0.0.1-r105.ebuild
similarity index 97%
rename from chromeos-base/nnapi/nnapi-0.0.1-r104.ebuild
rename to chromeos-base/nnapi/nnapi-0.0.1-r105.ebuild
index 796ff3d..e0ff108 100644
--- a/chromeos-base/nnapi/nnapi-0.0.1-r104.ebuild
+++ b/chromeos-base/nnapi/nnapi-0.0.1-r105.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("88a8969559064ce035eea270adbb5ed5cf472bbb" "e9ef20b988f629406f6a8d7fe22ae5f006abdbd2" "c1e30221aa92e7979cf0a0ee65914849db8b2dcb" "e2ccff249b3be3583ffb0e9be35db7be54715ec9" "08495901b78c7c3d9a1a81e541897c2ec114fe34" "f0356097d584b884e24b67c789b4800ec6895bd2" "83caf7c58917b971de049e882ec9b23816f12ca1" "59f317632862d15b59278a0235eb901270c2889d")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "febb5c918e5047e2dd8a2bd416944894f76e41b3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "53a4656104a89df4072d3101327f51fcf6c9cbb2" "b4147760c8f1da9f6749f61748d2cacf89237717" "078088f837cd0a9b1c3123b5d93904f4ec2f2af6" "cbb1596cd3157db5ffe44d03d24c30cc9ed53e38" "6d3d9da9942b38f318bc49866e0dca5ffefd99c8" "95bef85dda5cf0836566c16c6b0651ae91cca7e2" "2ea48bccbe24f13f304b13776b86028ca6022818")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "e9ef20b988f629406f6a8d7fe22ae5f006abdbd2" "c1e30221aa92e7979cf0a0ee65914849db8b2dcb" "e2ccff249b3be3583ffb0e9be35db7be54715ec9" "08495901b78c7c3d9a1a81e541897c2ec114fe34" "f0356097d584b884e24b67c789b4800ec6895bd2" "83caf7c58917b971de049e882ec9b23816f12ca1" "59f317632862d15b59278a0235eb901270c2889d")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "febb5c918e5047e2dd8a2bd416944894f76e41b3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "53a4656104a89df4072d3101327f51fcf6c9cbb2" "b4147760c8f1da9f6749f61748d2cacf89237717" "078088f837cd0a9b1c3123b5d93904f4ec2f2af6" "cbb1596cd3157db5ffe44d03d24c30cc9ed53e38" "6d3d9da9942b38f318bc49866e0dca5ffefd99c8" "95bef85dda5cf0836566c16c6b0651ae91cca7e2" "2ea48bccbe24f13f304b13776b86028ca6022818")
 inherit cros-constants
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/ocr/ocr-0.0.1-r34.ebuild b/chromeos-base/ocr/ocr-0.0.1-r35.ebuild
similarity index 91%
rename from chromeos-base/ocr/ocr-0.0.1-r34.ebuild
rename to chromeos-base/ocr/ocr-0.0.1-r35.ebuild
index 01e395e..244a2d2 100644
--- a/chromeos-base/ocr/ocr-0.0.1-r34.ebuild
+++ b/chromeos-base/ocr/ocr-0.0.1-r35.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "697eec34c5129d11b04c630c745b96cf47b43234" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "697eec34c5129d11b04c630c745b96cf47b43234" "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-r373.ebuild b/chromeos-base/oobe_config/oobe_config-0.0.1-r374.ebuild
similarity index 94%
rename from chromeos-base/oobe_config/oobe_config-0.0.1-r373.ebuild
rename to chromeos-base/oobe_config/oobe_config-0.0.1-r374.ebuild
index 3b7f6f7..706f982 100644
--- a/chromeos-base/oobe_config/oobe_config-0.0.1-r373.ebuild
+++ b/chromeos-base/oobe_config/oobe_config-0.0.1-r374.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "1023baf673223aa6f3a095cad3bb1d878a2bef4a" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "8b709631d01f33411578061c0dd8bc0a0b243694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "1023baf673223aa6f3a095cad3bb1d878a2bef4a" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r3254.ebuild b/chromeos-base/p2p/p2p-0.0.1-r3255.ebuild
similarity index 92%
rename from chromeos-base/p2p/p2p-0.0.1-r3254.ebuild
rename to chromeos-base/p2p/p2p-0.0.1-r3255.ebuild
index cb0a39c..ea6ab7e 100644
--- a/chromeos-base/p2p/p2p-0.0.1-r3254.ebuild
+++ b/chromeos-base/p2p/p2p-0.0.1-r3255.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694" "f8450508e6487031816df1175191c729d63d1cce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r72.ebuild b/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r73.ebuild
similarity index 92%
rename from chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r72.ebuild
rename to chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r73.ebuild
index dae3b43..933b24f 100644
--- a/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r72.ebuild
+++ b/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r73.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="378930a07756755517375d7af854d2bb817df674"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "9c62af8f7fea27d1b7037ecccc01bc24d9ae4ee8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "9c62af8f7fea27d1b7037ecccc01bc24d9ae4ee8" "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-r180.ebuild b/chromeos-base/patchpanel/patchpanel-0.0.2-r181.ebuild
similarity index 94%
rename from chromeos-base/patchpanel/patchpanel-0.0.2-r180.ebuild
rename to chromeos-base/patchpanel/patchpanel-0.0.2-r181.ebuild
index bb70590..a69b805 100644
--- a/chromeos-base/patchpanel/patchpanel-0.0.2-r180.ebuild
+++ b/chromeos-base/patchpanel/patchpanel-0.0.2-r181.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="378930a07756755517375d7af854d2bb817df674"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "9c62af8f7fea27d1b7037ecccc01bc24d9ae4ee8" "a29a344ca66578502e6000219a9211ac48c09f95" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "9c62af8f7fea27d1b7037ecccc01bc24d9ae4ee8" "a29a344ca66578502e6000219a9211ac48c09f95" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r1850.ebuild b/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r1851.ebuild
similarity index 89%
rename from chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r1850.ebuild
rename to chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r1851.ebuild
index 2c24e1e..2bbea70 100644
--- a/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r1850.ebuild
+++ b/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r1851.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1df6417a41eac12f37ec1d66cd1bef18a14b81f1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c5711e94f1e2955d244a0532a8f4026f478c9eaf" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c5711e94f1e2955d244a0532a8f4026f478c9eaf" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/permission_broker/permission_broker-0.0.1-r3102.ebuild b/chromeos-base/permission_broker/permission_broker-0.0.1-r3103.ebuild
similarity index 92%
rename from chromeos-base/permission_broker/permission_broker-0.0.1-r3102.ebuild
rename to chromeos-base/permission_broker/permission_broker-0.0.1-r3103.ebuild
index a07b334..76e865a 100644
--- a/chromeos-base/permission_broker/permission_broker-0.0.1-r3102.ebuild
+++ b/chromeos-base/permission_broker/permission_broker-0.0.1-r3103.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1df6417a41eac12f37ec1d66cd1bef18a14b81f1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c5711e94f1e2955d244a0532a8f4026f478c9eaf" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c5711e94f1e2955d244a0532a8f4026f478c9eaf" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r182.ebuild b/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r183.ebuild
similarity index 87%
rename from chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r182.ebuild
rename to chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r183.ebuild
index 4fb2218..f183019 100644
--- a/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r182.ebuild
+++ b/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r183.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "f6e985347a838bbbdd2997e97c4b4940571f2dd2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "f6e985347a838bbbdd2997e97c4b4940571f2dd2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/policy/..."
 )
diff --git a/chromeos-base/policy_utils/policy_utils-0.0.1-r184.ebuild b/chromeos-base/policy_utils/policy_utils-0.0.1-r185.ebuild
similarity index 88%
rename from chromeos-base/policy_utils/policy_utils-0.0.1-r184.ebuild
rename to chromeos-base/policy_utils/policy_utils-0.0.1-r185.ebuild
index 3d4db1a..4776fb9 100644
--- a/chromeos-base/policy_utils/policy_utils-0.0.1-r184.ebuild
+++ b/chromeos-base/policy_utils/policy_utils-0.0.1-r185.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "810726bd67b063c208f3b11b6078df471e15d38e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "810726bd67b063c208f3b11b6078df471e15d38e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2045.ebuild b/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2046.ebuild
similarity index 87%
rename from chromeos-base/power_manager-client/power_manager-client-0.0.1-r2045.ebuild
rename to chromeos-base/power_manager-client/power_manager-client-0.0.1-r2046.ebuild
index 06e9bd3..d3bbfac7 100644
--- a/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2045.ebuild
+++ b/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2046.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="ca821c18f0d4e702204e0bea55bb627b9591a187"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "ffa1c0c3843a18217b464be52d6253b57bb30f6a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ffa1c0c3843a18217b464be52d6253b57bb30f6a" "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-r3615.ebuild b/chromeos-base/power_manager/power_manager-0.0.2-r3616.ebuild
similarity index 97%
rename from chromeos-base/power_manager/power_manager-0.0.2-r3615.ebuild
rename to chromeos-base/power_manager/power_manager-0.0.2-r3616.ebuild
index 7e4beb6..53cbf8d 100644
--- a/chromeos-base/power_manager/power_manager-0.0.2-r3615.ebuild
+++ b/chromeos-base/power_manager/power_manager-0.0.2-r3616.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="ca821c18f0d4e702204e0bea55bb627b9591a187"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "da25eefd3c0c9f59c7ef606fbc9c4ac8dacf0228" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "ffa1c0c3843a18217b464be52d6253b57bb30f6a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "da25eefd3c0c9f59c7ef606fbc9c4ac8dacf0228" "316f9280ff87203d961bd29b773e08824f1c45d4" "8b709631d01f33411578061c0dd8bc0a0b243694" "ffa1c0c3843a18217b464be52d6253b57bb30f6a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/print_tools/print_tools-0.0.1-r109.ebuild b/chromeos-base/print_tools/print_tools-0.0.1-r110.ebuild
similarity index 86%
rename from chromeos-base/print_tools/print_tools-0.0.1-r109.ebuild
rename to chromeos-base/print_tools/print_tools-0.0.1-r110.ebuild
index 67d494e..d5c71dd 100644
--- a/chromeos-base/print_tools/print_tools-0.0.1-r109.ebuild
+++ b/chromeos-base/print_tools/print_tools-0.0.1-r110.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c6bc491fe392f5e9d523ed67fd52f0577c5d7c6c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c6bc491fe392f5e9d523ed67fd52f0577c5d7c6c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/quipper/quipper-0.0.1-r2639.ebuild b/chromeos-base/quipper/quipper-0.0.1-r2640.ebuild
similarity index 93%
rename from chromeos-base/quipper/quipper-0.0.1-r2639.ebuild
rename to chromeos-base/quipper/quipper-0.0.1-r2640.ebuild
index a8535ff..12912b5 100644
--- a/chromeos-base/quipper/quipper-0.0.1-r2639.ebuild
+++ b/chromeos-base/quipper/quipper-0.0.1-r2640.ebuild
@@ -4,8 +4,8 @@
 # Don't use Makefile.external here as it fetches from the network.
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/rendernodehost/rendernodehost-0.0.1-r159.ebuild b/chromeos-base/rendernodehost/rendernodehost-0.0.1-r160.ebuild
similarity index 85%
rename from chromeos-base/rendernodehost/rendernodehost-0.0.1-r159.ebuild
rename to chromeos-base/rendernodehost/rendernodehost-0.0.1-r160.ebuild
index 9518c40..426f1e1 100644
--- a/chromeos-base/rendernodehost/rendernodehost-0.0.1-r159.ebuild
+++ b/chromeos-base/rendernodehost/rendernodehost-0.0.1-r160.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/run_oci/run_oci-0.0.1-r1075.ebuild b/chromeos-base/run_oci/run_oci-0.0.1-r1076.ebuild
similarity index 89%
rename from chromeos-base/run_oci/run_oci-0.0.1-r1075.ebuild
rename to chromeos-base/run_oci/run_oci-0.0.1-r1076.ebuild
index efc25ec..b9d3391 100644
--- a/chromeos-base/run_oci/run_oci-0.0.1-r1075.ebuild
+++ b/chromeos-base/run_oci/run_oci-0.0.1-r1076.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "9309bac78aa99594edd90af8a51a087bca212ba9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "ed310628c7b59ac5528ea8347990fc4f5e95c915" "9309bac78aa99594edd90af8a51a087bca212ba9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/runtime_probe/runtime_probe-0.0.1-r490.ebuild b/chromeos-base/runtime_probe/runtime_probe-0.0.1-r491.ebuild
similarity index 94%
rename from chromeos-base/runtime_probe/runtime_probe-0.0.1-r490.ebuild
rename to chromeos-base/runtime_probe/runtime_probe-0.0.1-r491.ebuild
index 6495a8b..bb60a72 100644
--- a/chromeos-base/runtime_probe/runtime_probe-0.0.1-r490.ebuild
+++ b/chromeos-base/runtime_probe/runtime_probe-0.0.1-r491.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "316f9280ff87203d961bd29b773e08824f1c45d4" "fae342a0fc21bedcbf458a1b43150187b54dbe03" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "316f9280ff87203d961bd29b773e08824f1c45d4" "fae342a0fc21bedcbf458a1b43150187b54dbe03" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r9.ebuild b/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r10.ebuild
similarity index 88%
rename from chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r9.ebuild
rename to chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r10.ebuild
index 89a86d8..0d91d18 100644
--- a/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r9.ebuild
+++ b/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r10.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b847f02236c7222cd851f0b7035da91eab8b285" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b847f02236c7222cd851f0b7035da91eab8b285" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_SUBTREE="common-mk screen-capture-utils .gn"
diff --git a/chromeos-base/sealed_storage/sealed_storage-0.0.1-r268.ebuild b/chromeos-base/sealed_storage/sealed_storage-0.0.1-r269.ebuild
similarity index 91%
rename from chromeos-base/sealed_storage/sealed_storage-0.0.1-r268.ebuild
rename to chromeos-base/sealed_storage/sealed_storage-0.0.1-r269.ebuild
index af33885..097a5184 100644
--- a/chromeos-base/sealed_storage/sealed_storage-0.0.1-r268.ebuild
+++ b/chromeos-base/sealed_storage/sealed_storage-0.0.1-r269.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="ca821c18f0d4e702204e0bea55bb627b9591a187"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "d4f0dc8e33c1019088a8da237bd6137500894675" "a33cb2ef1e36a1d6c4c593dd3c575cfadca384dd" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "d4f0dc8e33c1019088a8da237bd6137500894675" "a33cb2ef1e36a1d6c4c593dd3c575cfadca384dd" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r902.ebuild b/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r903.ebuild
similarity index 87%
rename from chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r902.ebuild
rename to chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r903.ebuild
index 698fc55..ebe9e4f 100644
--- a/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r902.ebuild
+++ b/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r903.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "4f428eceb77ddeae2a9cdbc99367fd321c975f15" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "4f428eceb77ddeae2a9cdbc99367fd321c975f15" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/secure-wipe/secure-wipe-0.0.1-r123.ebuild b/chromeos-base/secure-wipe/secure-wipe-0.0.1-r124.ebuild
similarity index 87%
rename from chromeos-base/secure-wipe/secure-wipe-0.0.1-r123.ebuild
rename to chromeos-base/secure-wipe/secure-wipe-0.0.1-r124.ebuild
index 69b6045..dba7579 100644
--- a/chromeos-base/secure-wipe/secure-wipe-0.0.1-r123.ebuild
+++ b/chromeos-base/secure-wipe/secure-wipe-0.0.1-r124.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "898687cfd878621b0aa42a27138c8a6c72210b16" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "898687cfd878621b0aa42a27138c8a6c72210b16" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD="1"
diff --git a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2065.ebuild b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2066.ebuild
similarity index 89%
rename from chromeos-base/session_manager-client/session_manager-client-0.0.1-r2065.ebuild
rename to chromeos-base/session_manager-client/session_manager-client-0.0.1-r2066.ebuild
index 936ca88..28b5e4c 100644
--- a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2065.ebuild
+++ b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2066.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "05f4e64492047e6a8147c9823ee1abed1f9128c3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "05f4e64492047e6a8147c9823ee1abed1f9128c3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/shill-cli/shill-cli-0.0.1-r69.ebuild b/chromeos-base/shill-cli/shill-cli-0.0.1-r70.ebuild
similarity index 87%
rename from chromeos-base/shill-cli/shill-cli-0.0.1-r69.ebuild
rename to chromeos-base/shill-cli/shill-cli-0.0.1-r70.ebuild
index 9f22347..1ef00f9 100644
--- a/chromeos-base/shill-cli/shill-cli-0.0.1-r69.ebuild
+++ b/chromeos-base/shill-cli/shill-cli-0.0.1-r70.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "4fa61f1fa958cd34d16c6035cb2e6430dd6fd7b0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "4fa61f1fa958cd34d16c6035cb2e6430dd6fd7b0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/shill-client/shill-client-0.0.1-r2262.ebuild b/chromeos-base/shill-client/shill-client-0.0.1-r2263.ebuild
similarity index 87%
rename from chromeos-base/shill-client/shill-client-0.0.1-r2262.ebuild
rename to chromeos-base/shill-client/shill-client-0.0.1-r2263.ebuild
index 9ba66f5..3e428f7 100644
--- a/chromeos-base/shill-client/shill-client-0.0.1-r2262.ebuild
+++ b/chromeos-base/shill-client/shill-client-0.0.1-r2263.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="36356aadfbf2facc6fd0dfa45cc39defbcc5999f"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "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-r33.ebuild b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r34.ebuild
similarity index 89%
rename from chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r33.ebuild
rename to chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r34.ebuild
index f7ace3a..6e14e686 100644
--- a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r33.ebuild
+++ b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r34.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="36356aadfbf2facc6fd0dfa45cc39defbcc5999f"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "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-r109.ebuild b/chromeos-base/shill-net/shill-net-0.0.1-r110.ebuild
similarity index 90%
rename from chromeos-base/shill-net/shill-net-0.0.1-r109.ebuild
rename to chromeos-base/shill-net/shill-net-0.0.1-r110.ebuild
index d9def8a..55916e0 100644
--- a/chromeos-base/shill-net/shill-net-0.0.1-r109.ebuild
+++ b/chromeos-base/shill-net/shill-net-0.0.1-r110.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="36356aadfbf2facc6fd0dfa45cc39defbcc5999f"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "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-r2330.ebuild b/chromeos-base/shill/shill-0.0.5-r2331.ebuild
similarity index 97%
rename from chromeos-base/shill/shill-0.0.5-r2330.ebuild
rename to chromeos-base/shill/shill-0.0.5-r2331.ebuild
index 78332a4..c09efea 100644
--- a/chromeos-base/shill/shill-0.0.5-r2330.ebuild
+++ b/chromeos-base/shill/shill-0.0.5-r2331.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="36356aadfbf2facc6fd0dfa45cc39defbcc5999f"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "8b709631d01f33411578061c0dd8bc0a0b243694" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e0ed49a505c69afe4a7f216b86744c3dabcd5e4c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "8b709631d01f33411578061c0dd8bc0a0b243694" "acdea33b528d4ce11d9a9a3b10fd02728eb1ddd5" "e0ed49a505c69afe4a7f216b86744c3dabcd5e4c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/smbfs/smbfs-0.0.1-r167.ebuild b/chromeos-base/smbfs/smbfs-0.0.1-r168.ebuild
similarity index 92%
rename from chromeos-base/smbfs/smbfs-0.0.1-r167.ebuild
rename to chromeos-base/smbfs/smbfs-0.0.1-r168.ebuild
index 3d29aa0..b64ee44 100644
--- a/chromeos-base/smbfs/smbfs-0.0.1-r167.ebuild
+++ b/chromeos-base/smbfs/smbfs-0.0.1-r168.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "bb6856c3a41209f9f1b4692de3f1e180a19d2135" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "bb6856c3a41209f9f1b4692de3f1e180a19d2135" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/smbprovider/smbprovider-0.0.1-r678.ebuild b/chromeos-base/smbprovider/smbprovider-0.0.1-r679.ebuild
similarity index 93%
rename from chromeos-base/smbprovider/smbprovider-0.0.1-r678.ebuild
rename to chromeos-base/smbprovider/smbprovider-0.0.1-r679.ebuild
index a358801..3f1052b 100644
--- a/chromeos-base/smbprovider/smbprovider-0.0.1-r678.ebuild
+++ b/chromeos-base/smbprovider/smbprovider-0.0.1-r679.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "2fd1ce78f8da4aa4f9dd0dcb45b5e5e81f898bcd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "2fd1ce78f8da4aa4f9dd0dcb45b5e5e81f898bcd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/smogcheck/smogcheck-0.0.1-r3040.ebuild b/chromeos-base/smogcheck/smogcheck-0.0.1-r3041.ebuild
similarity index 86%
rename from chromeos-base/smogcheck/smogcheck-0.0.1-r3040.ebuild
rename to chromeos-base/smogcheck/smogcheck-0.0.1-r3041.ebuild
index 85d1533..caf73bf 100644
--- a/chromeos-base/smogcheck/smogcheck-0.0.1-r3040.ebuild
+++ b/chromeos-base/smogcheck/smogcheck-0.0.1-r3041.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "25b90cd13b01122d778a1d55d814c5b001b88d22" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "25b90cd13b01122d778a1d55d814c5b001b88d22" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE="common-mk smogcheck .gn"
diff --git a/chromeos-base/sommelier/sommelier-0.0.1-r82.ebuild b/chromeos-base/sommelier/sommelier-0.0.1-r83.ebuild
similarity index 92%
rename from chromeos-base/sommelier/sommelier-0.0.1-r82.ebuild
rename to chromeos-base/sommelier/sommelier-0.0.1-r83.ebuild
index 50a2c85..abbbd1a 100644
--- a/chromeos-base/sommelier/sommelier-0.0.1-r82.ebuild
+++ b/chromeos-base/sommelier/sommelier-0.0.1-r83.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="ca821c18f0d4e702204e0bea55bb627b9591a187"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "3f8be0810f4ffe8b480013baf89377f2f7e67bf1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "3f8be0810f4ffe8b480013baf89377f2f7e67bf1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/st_flash/st_flash-0.0.1-r1227.ebuild b/chromeos-base/st_flash/st_flash-0.0.1-r1228.ebuild
similarity index 83%
rename from chromeos-base/st_flash/st_flash-0.0.1-r1227.ebuild
rename to chromeos-base/st_flash/st_flash-0.0.1-r1228.ebuild
index b3c529d..1906de4 100644
--- a/chromeos-base/st_flash/st_flash-0.0.1-r1227.ebuild
+++ b/chromeos-base/st_flash/st_flash-0.0.1-r1228.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "385387e5576998414ebd9e06ac553d13c0f69025" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "385387e5576998414ebd9e06ac553d13c0f69025" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/syslog-cat/syslog-cat-0.0.1-r21.ebuild b/chromeos-base/syslog-cat/syslog-cat-0.0.1-r22.ebuild
similarity index 85%
rename from chromeos-base/syslog-cat/syslog-cat-0.0.1-r21.ebuild
rename to chromeos-base/syslog-cat/syslog-cat-0.0.1-r22.ebuild
index a996e60..10cd619 100644
--- a/chromeos-base/syslog-cat/syslog-cat-0.0.1-r21.ebuild
+++ b/chromeos-base/syslog-cat/syslog-cat-0.0.1-r22.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "d7ac91bd9fca40b007f46a3584fbb60fac4f97d7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "d7ac91bd9fca40b007f46a3584fbb60fac4f97d7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/system-proxy/system-proxy-0.0.1-r167.ebuild b/chromeos-base/system-proxy/system-proxy-0.0.1-r168.ebuild
similarity index 93%
rename from chromeos-base/system-proxy/system-proxy-0.0.1-r167.ebuild
rename to chromeos-base/system-proxy/system-proxy-0.0.1-r168.ebuild
index ae11ba8..8d48aeb 100644
--- a/chromeos-base/system-proxy/system-proxy-0.0.1-r167.ebuild
+++ b/chromeos-base/system-proxy/system-proxy-0.0.1-r168.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "81eaa7d8f0f442daa4157055e5712a0a475441d0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "5c6a69ae1a339332642149aa39da47d14efbe3fd" "81eaa7d8f0f442daa4157055e5712a0a475441d0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/system_api/system_api-0.0.1-r4162.ebuild b/chromeos-base/system_api/system_api-0.0.1-r4163.ebuild
similarity index 94%
rename from chromeos-base/system_api/system_api-0.0.1-r4162.ebuild
rename to chromeos-base/system_api/system_api-0.0.1-r4163.ebuild
index 6bf008c..c417ca2 100644
--- a/chromeos-base/system_api/system_api-0.0.1-r4162.ebuild
+++ b/chromeos-base/system_api/system_api-0.0.1-r4163.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c76cbfe5a183dbd228bf681e87a27da2bcf47b54"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e843dfcef0c09b0aa853eadf590be3062ce01a98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e843dfcef0c09b0aa853eadf590be3062ce01a98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/system_api/..."
 )
diff --git a/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r173.ebuild b/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r174.ebuild
similarity index 89%
rename from chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r173.ebuild
rename to chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r174.ebuild
index 5111fbb..e442f6d 100644
--- a/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r173.ebuild
+++ b/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r174.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "5ad2059d9b205494234ec03fc74effd3a155692b")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c1fa41175af84710f4a22f81faab420dcbb774c5")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "bda522415d37bc8f18b60acad3ac5b9382764f68")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c1fa41175af84710f4a22f81faab420dcbb774c5")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/platform/tast-tests")
 CROS_WORKON_LOCALNAME=("platform2" "platform/tast-tests")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/tast-tests")
diff --git a/chromeos-base/thd/thd-0.0.1-r315.ebuild b/chromeos-base/thd/thd-0.0.1-r316.ebuild
similarity index 85%
rename from chromeos-base/thd/thd-0.0.1-r315.ebuild
rename to chromeos-base/thd/thd-0.0.1-r316.ebuild
index b8214c5..33909fa 100644
--- a/chromeos-base/thd/thd-0.0.1-r315.ebuild
+++ b/chromeos-base/thd/thd-0.0.1-r316.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "1c6d674d28b3b153c7986a900cf2dc5c05dfd0b8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "1c6d674d28b3b153c7986a900cf2dc5c05dfd0b8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/timberslide/timberslide-0.0.1-r1487.ebuild b/chromeos-base/timberslide/timberslide-0.0.1-r1488.ebuild
similarity index 89%
rename from chromeos-base/timberslide/timberslide-0.0.1-r1487.ebuild
rename to chromeos-base/timberslide/timberslide-0.0.1-r1488.ebuild
index ef15856f..d32b1a2 100644
--- a/chromeos-base/timberslide/timberslide-0.0.1-r1487.ebuild
+++ b/chromeos-base/timberslide/timberslide-0.0.1-r1488.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694" "4fc04a2f4186bc5f583ec5f27235868dc3343d5b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r4197.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4198.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4197.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4198.ebuild
index b888f44..990e834 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4197.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r4198.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="7f1bc11ec5cc44c67a6286df080c3894253f39b1"
-CROS_WORKON_TREE="417b6138c945aa89b1cb81984ccfe5923c4a83cd"
+CROS_WORKON_COMMIT="ffd483109ae4a7676be44556b82c23d59cdbda69"
+CROS_WORKON_TREE="c08c7b15eb0c97630e1d970bad7385cb9818c7b2"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r864.ebuild b/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r865.ebuild
similarity index 90%
rename from chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r864.ebuild
rename to chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r865.ebuild
index 9aed5bf..71f822a 100644
--- a/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r864.ebuild
+++ b/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r865.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "106994593e4698856f0de3f4da8e62cfeb0c1694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "106994593e4698856f0de3f4da8e62cfeb0c1694" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/touch_keyboard/touch_keyboard-0.0.1-r1146.ebuild b/chromeos-base/touch_keyboard/touch_keyboard-0.0.1-r1147.ebuild
similarity index 91%
rename from chromeos-base/touch_keyboard/touch_keyboard-0.0.1-r1146.ebuild
rename to chromeos-base/touch_keyboard/touch_keyboard-0.0.1-r1147.ebuild
index ceaabfa..d744110 100644
--- a/chromeos-base/touch_keyboard/touch_keyboard-0.0.1-r1146.ebuild
+++ b/chromeos-base/touch_keyboard/touch_keyboard-0.0.1-r1147.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1779.ebuild b/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1780.ebuild
similarity index 86%
rename from chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1779.ebuild
rename to chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1780.ebuild
index 66fc7f1..37ef963 100644
--- a/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1779.ebuild
+++ b/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1780.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "bd13eabfc804c66584fba6988a8b836b170442d7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "bd13eabfc804c66584fba6988a8b836b170442d7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r208.ebuild b/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r209.ebuild
similarity index 92%
rename from chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r208.ebuild
rename to chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r209.ebuild
index b6cbc16..65e0fa22 100644
--- a/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r208.ebuild
+++ b/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r209.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="ca821c18f0d4e702204e0bea55bb627b9591a187"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a33cb2ef1e36a1d6c4c593dd3c575cfadca384dd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "a33cb2ef1e36a1d6c4c593dd3c575cfadca384dd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2133.ebuild b/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2134.ebuild
similarity index 94%
rename from chromeos-base/tpm_manager/tpm_manager-0.0.1-r2133.ebuild
rename to chromeos-base/tpm_manager/tpm_manager-0.0.1-r2134.ebuild
index cc7c7b1..b5f2bcd 100644
--- a/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2133.ebuild
+++ b/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2134.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="ca821c18f0d4e702204e0bea55bb627b9591a187"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "989d840598227b15d78525d5f92c806011a9c158" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "8b709631d01f33411578061c0dd8bc0a0b243694" "a33cb2ef1e36a1d6c4c593dd3c575cfadca384dd" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "989d840598227b15d78525d5f92c806011a9c158" "6bcff6ea2d0ff76e4398205aee498eb314d63902" "8b709631d01f33411578061c0dd8bc0a0b243694" "a33cb2ef1e36a1d6c4c593dd3c575cfadca384dd" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r187.ebuild b/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r188.ebuild
similarity index 90%
rename from chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r187.ebuild
rename to chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r188.ebuild
index dd87dc1..d637d8e 100644
--- a/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r187.ebuild
+++ b/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r188.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4b2d5b29c42d5d97536783fe2739031d18e01643"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "d4688b618445182a5925e02136792a8973362e7c" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "d4688b618445182a5925e02136792a8973362e7c" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/trunks/trunks-0.0.1-r2875.ebuild b/chromeos-base/trunks/trunks-0.0.1-r2876.ebuild
similarity index 95%
rename from chromeos-base/trunks/trunks-0.0.1-r2875.ebuild
rename to chromeos-base/trunks/trunks-0.0.1-r2876.ebuild
index fca4ad9..d15a282 100644
--- a/chromeos-base/trunks/trunks-0.0.1-r2875.ebuild
+++ b/chromeos-base/trunks/trunks-0.0.1-r2876.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4b2d5b29c42d5d97536783fe2739031d18e01643"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "989d840598227b15d78525d5f92c806011a9c158" "20ed8021024637e492670d20fa5969a2ad75e4b6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "989d840598227b15d78525d5f92c806011a9c158" "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-r93.ebuild b/chromeos-base/typecd/typecd-0.0.1-r94.ebuild
similarity index 89%
rename from chromeos-base/typecd/typecd-0.0.1-r93.ebuild
rename to chromeos-base/typecd/typecd-0.0.1-r94.ebuild
index d21e615..ea2286c5 100644
--- a/chromeos-base/typecd/typecd-0.0.1-r93.ebuild
+++ b/chromeos-base/typecd/typecd-0.0.1-r94.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c8dd34ff9d7a2663095e200d8a1b0936fbd5a753" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c8dd34ff9d7a2663095e200d8a1b0936fbd5a753" "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-r1043.ebuild b/chromeos-base/u2fd/u2fd-0.0.1-r1044.ebuild
similarity index 93%
rename from chromeos-base/u2fd/u2fd-0.0.1-r1043.ebuild
rename to chromeos-base/u2fd/u2fd-0.0.1-r1044.ebuild
index 430be329..7f164d9 100644
--- a/chromeos-base/u2fd/u2fd-0.0.1-r1043.ebuild
+++ b/chromeos-base/u2fd/u2fd-0.0.1-r1044.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "20ed8021024637e492670d20fa5969a2ad75e4b6" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "bac582e24e715a9bb440cd200c6194a45b704591" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "20ed8021024637e492670d20fa5969a2ad75e4b6" "989d840598227b15d78525d5f92c806011a9c158" "8b709631d01f33411578061c0dd8bc0a0b243694" "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-r1823.ebuild b/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1824.ebuild
similarity index 89%
rename from chromeos-base/update_engine-client/update_engine-client-0.0.1-r1823.ebuild
rename to chromeos-base/update_engine-client/update_engine-client-0.0.1-r1824.ebuild
index d18857d..755fc51 100644
--- a/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1823.ebuild
+++ b/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1824.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "beb85b361e14c5143505319ee8f2c1bdcd2cecce")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "94749dfce3e7f80982132282c7a18287603acb05")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "beb85b361e14c5143505319ee8f2c1bdcd2cecce")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "94749dfce3e7f80982132282c7a18287603acb05")
 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-r3676.ebuild b/chromeos-base/update_engine/update_engine-0.0.3-r3677.ebuild
similarity index 96%
rename from chromeos-base/update_engine/update_engine-0.0.3-r3676.ebuild
rename to chromeos-base/update_engine/update_engine-0.0.3-r3677.ebuild
index 01fbe88..a97723a 100644
--- a/chromeos-base/update_engine/update_engine-0.0.3-r3676.ebuild
+++ b/chromeos-base/update_engine/update_engine-0.0.3-r3677.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "beb85b361e14c5143505319ee8f2c1bdcd2cecce")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "94749dfce3e7f80982132282c7a18287603acb05")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "beb85b361e14c5143505319ee8f2c1bdcd2cecce")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "94749dfce3e7f80982132282c7a18287603acb05")
 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/ureadahead-diff/ureadahead-diff-0.0.1-r71.ebuild b/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r72.ebuild
similarity index 86%
rename from chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r71.ebuild
rename to chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r72.ebuild
index 8760e1b9a..ba68ee2f 100644
--- a/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r71.ebuild
+++ b/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r72.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "977d7a50e6c3ca7269ed8703960e004ff32baa90" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "977d7a50e6c3ca7269ed8703960e004ff32baa90" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r281.ebuild b/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r282.ebuild
similarity index 93%
rename from chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r281.ebuild
rename to chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r282.ebuild
index 0d961fa..6cf0129 100644
--- a/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r281.ebuild
+++ b/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r282.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694" "5dc493e2caaa42bf79c32b35650161dfbdd62747" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "5dc493e2caaa42bf79c32b35650161dfbdd62747" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1214.ebuild b/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1215.ebuild
similarity index 85%
rename from chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1214.ebuild
rename to chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1215.ebuild
index baabebf..84198e0 100644
--- a/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1214.ebuild
+++ b/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1215.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"
diff --git a/chromeos-base/verity/verity-0.0.1-r155.ebuild b/chromeos-base/verity/verity-0.0.1-r156.ebuild
similarity index 87%
rename from chromeos-base/verity/verity-0.0.1-r155.ebuild
rename to chromeos-base/verity/verity-0.0.1-r156.ebuild
index f012660..4fc0036 100644
--- a/chromeos-base/verity/verity-0.0.1-r155.ebuild
+++ b/chromeos-base/verity/verity-0.0.1-r156.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "2b6d4230c92e83e39209823855064483eed04754" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "2b6d4230c92e83e39209823855064483eed04754" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r789.ebuild b/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r790.ebuild
similarity index 91%
rename from chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r789.ebuild
rename to chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r790.ebuild
index e1cbb14..75202bb 100644
--- a/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r789.ebuild
+++ b/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r790.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "68d42e0a25fe42176ee5908628dc4402b917b4d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "68d42e0a25fe42176ee5908628dc4402b917b4d4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r217.ebuild b/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r218.ebuild
similarity index 91%
rename from chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r217.ebuild
rename to chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r218.ebuild
index da8e7ec..352b8dd 100644
--- a/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r217.ebuild
+++ b/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r218.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "b83f5b06c307bf2ee63146c31bf182fc3bf06350")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "f46d4f200713a1e4f17d0f391b74f985120cdfcb")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "b83f5b06c307bf2ee63146c31bf182fc3bf06350")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "f46d4f200713a1e4f17d0f391b74f985120cdfcb")
 CROS_WORKON_LOCALNAME=("platform2" "third_party/virtual-usb-printer")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/virtual-usb-printer")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/virtual-usb-printer")
diff --git a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r992.ebuild b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r993.ebuild
similarity index 95%
rename from chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r992.ebuild
rename to chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r993.ebuild
index f9e8543..607aeab 100644
--- a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r992.ebuild
+++ b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r993.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="af2fe252bed3130cd6d5137b6c1969193f810ff1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "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-r1159.ebuild b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1160.ebuild
similarity index 97%
rename from chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1159.ebuild
rename to chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1160.ebuild
index ef50f91..3ada1c2 100644
--- a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1159.ebuild
+++ b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1160.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="af2fe252bed3130cd6d5137b6c1969193f810ff1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694" "e8f1bd9fd4320646b58f5be9c6e7bb479d6513ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/vm_protos/vm_protos-0.0.1-r169.ebuild b/chromeos-base/vm_protos/vm_protos-0.0.1-r170.ebuild
similarity index 90%
rename from chromeos-base/vm_protos/vm_protos-0.0.1-r169.ebuild
rename to chromeos-base/vm_protos/vm_protos-0.0.1-r170.ebuild
index 37ec025..7a74ced 100644
--- a/chromeos-base/vm_protos/vm_protos-0.0.1-r169.ebuild
+++ b/chromeos-base/vm_protos/vm_protos-0.0.1-r170.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "2419b35afb4ccc369101dd1ec0d76b2e1917e42d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "2419b35afb4ccc369101dd1ec0d76b2e1917e42d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/vm_tools/..."
 )
diff --git a/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2768.ebuild b/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2769.ebuild
similarity index 89%
rename from chromeos-base/vpn-manager/vpn-manager-0.0.1-r2768.ebuild
rename to chromeos-base/vpn-manager/vpn-manager-0.0.1-r2769.ebuild
index 693ca5f..731ecfa 100644
--- a/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2768.ebuild
+++ b/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2769.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e0ed49a505c69afe4a7f216b86744c3dabcd5e4c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e0ed49a505c69afe4a7f216b86744c3dabcd5e4c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/webserver/webserver-0.0.1-r2292.ebuild b/chromeos-base/webserver/webserver-0.0.1-r2293.ebuild
similarity index 93%
rename from chromeos-base/webserver/webserver-0.0.1-r2292.ebuild
rename to chromeos-base/webserver/webserver-0.0.1-r2293.ebuild
index 4c898f57..83a0823 100644
--- a/chromeos-base/webserver/webserver-0.0.1-r2292.ebuild
+++ b/chromeos-base/webserver/webserver-0.0.1-r2293.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="1df6417a41eac12f37ec1d66cd1bef18a14b81f1"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "c5711e94f1e2955d244a0532a8f4026f478c9eaf" "a3a7a1df955f71ee22313f09efbfb83bb6e66bae" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "c5711e94f1e2955d244a0532a8f4026f478c9eaf" "a3a7a1df955f71ee22313f09efbfb83bb6e66bae" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r125.ebuild b/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r126.ebuild
similarity index 89%
rename from chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r125.ebuild
rename to chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r126.ebuild
index 913bf59..f1362f2 100644
--- a/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r125.ebuild
+++ b/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r126.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "bf3184eecb9926a81042768d016ede2399b2a52f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "bf3184eecb9926a81042768d016ede2399b2a52f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/wilco_dtc/..."
 )
diff --git a/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r88.ebuild b/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r89.ebuild
similarity index 97%
rename from dev-libs/libtextclassifier/libtextclassifier-0.0.1-r88.ebuild
rename to dev-libs/libtextclassifier/libtextclassifier-0.0.1-r89.ebuild
index 2ee7cb9..ea221e0 100644
--- a/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r88.ebuild
+++ b/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r89.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "4c965f1c12b3c7a37f6126cef737a8fe33f4677c")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a243a7ff07a53f79bc1acb91dc6890f6e13db061")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "4c965f1c12b3c7a37f6126cef737a8fe33f4677c")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a243a7ff07a53f79bc1acb91dc6890f6e13db061")
 CROS_WORKON_LOCALNAME=("../platform2" "libtextclassifier")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/libtextclassifier")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/libtextclassifier")
diff --git a/dev-libs/libutf/libutf-0.0.1-r42.ebuild b/dev-libs/libutf/libutf-0.0.1-r43.ebuild
similarity index 87%
rename from dev-libs/libutf/libutf-0.0.1-r42.ebuild
rename to dev-libs/libutf/libutf-0.0.1-r43.ebuild
index d4e1597..e2a2308 100644
--- a/dev-libs/libutf/libutf-0.0.1-r42.ebuild
+++ b/dev-libs/libutf/libutf-0.0.1-r43.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "c17bb435be940edf1aff81469215bb6a071f3c38")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fc022abae9d52285526cb0dda697e2bea18696ca")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "c17bb435be940edf1aff81469215bb6a071f3c38")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fc022abae9d52285526cb0dda697e2bea18696ca")
 CROS_WORKON_LOCALNAME=("../platform2" "../aosp/external/libutf")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/external/libutf")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/libutf")
diff --git a/dev-libs/marisa-aosp/marisa-aosp-0.0.1-r21.ebuild b/dev-libs/marisa-aosp/marisa-aosp-0.0.1-r22.ebuild
similarity index 92%
rename from dev-libs/marisa-aosp/marisa-aosp-0.0.1-r21.ebuild
rename to dev-libs/marisa-aosp/marisa-aosp-0.0.1-r22.ebuild
index 8bbcb9f..d5b7ed7 100644
--- a/dev-libs/marisa-aosp/marisa-aosp-0.0.1-r21.ebuild
+++ b/dev-libs/marisa-aosp/marisa-aosp-0.0.1-r22.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 DESCRIPTION="MARISA: Matching Algorithm with Recursively Implemented StorAge (AOSP fork)"
 HOMEPAGE="https://android.googlesource.com/platform/external/marisa-trie/"
 
diff --git a/dev-libs/modp_b64/modp_b64-0.0.1-r102.ebuild b/dev-libs/modp_b64/modp_b64-0.0.1-r103.ebuild
similarity index 88%
rename from dev-libs/modp_b64/modp_b64-0.0.1-r102.ebuild
rename to dev-libs/modp_b64/modp_b64-0.0.1-r103.ebuild
index b3f8c0a..c313edb0 100644
--- a/dev-libs/modp_b64/modp_b64-0.0.1-r102.ebuild
+++ b/dev-libs/modp_b64/modp_b64-0.0.1-r103.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT=("51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e" "467734f4870d3ab23968f5ebdd461f6112e4103b")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "0d9f5ec1543458ecbe0d97bbabbdd59b79d56c5a")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "467734f4870d3ab23968f5ebdd461f6112e4103b")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "0d9f5ec1543458ecbe0d97bbabbdd59b79d56c5a")
 inherit cros-constants
 
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/modp_b64")
diff --git a/dev-rust/cros_fuzz/cros_fuzz-0.1.0-r7.ebuild b/dev-rust/cros_fuzz/cros_fuzz-0.1.0-r8.ebuild
similarity index 79%
rename from dev-rust/cros_fuzz/cros_fuzz-0.1.0-r7.ebuild
rename to dev-rust/cros_fuzz/cros_fuzz-0.1.0-r8.ebuild
index 98aa23e..80cce64 100644
--- a/dev-rust/cros_fuzz/cros_fuzz-0.1.0-r7.ebuild
+++ b/dev-rust/cros_fuzz/cros_fuzz-0.1.0-r8.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("90bf2838f56bffe127636b5ea4988485595819a8" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("90bf2838f56bffe127636b5ea4988485595819a8" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_RUST_SUBDIR="cros-fuzz"
 
 CROS_WORKON_LOCALNAME="../platform2"
diff --git a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r575.ebuild b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r576.ebuild
similarity index 88%
rename from media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r575.ebuild
rename to media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r576.ebuild
index e40163c..0b02d40 100644
--- a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r575.ebuild
+++ b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r576.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "4a915605af1cd7e632f8e36813007c5403431db2" "871bb7e6654a823f1468a5857b4c74f12aaedbb5" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "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-r511.ebuild b/media-libs/arc-camera-service/arc-camera-service-0.0.1-r512.ebuild
similarity index 89%
rename from media-libs/arc-camera-service/arc-camera-service-0.0.1-r511.ebuild
rename to media-libs/arc-camera-service/arc-camera-service-0.0.1-r512.ebuild
index 550c218..a6c355b 100644
--- a/media-libs/arc-camera-service/arc-camera-service-0.0.1-r511.ebuild
+++ b/media-libs/arc-camera-service/arc-camera-service-0.0.1-r512.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "df8b92601642272b22c923611d7733626e13f212" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "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/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r150.ebuild b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r151.ebuild
similarity index 86%
rename from media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r150.ebuild
rename to media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r151.ebuild
index f6edce1..a4e69b1 100644
--- a/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r150.ebuild
+++ b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r151.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "82d90b383f9fe16cd8f88ecf297d788777842b22" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "82d90b383f9fe16cd8f88ecf297d788777842b22" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 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-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r27.ebuild b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r28.ebuild
similarity index 85%
rename from media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r27.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r28.ebuild
index 98471b4..e2208bb 100644
--- a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r27.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r28.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "e561a53ad8f49dabb34311f6c54702134a36cdac" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "98f245ce60e448299ca50d3675109ed267ff393d" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/809389): Avoid directly including headers from other packages.
@@ -21,17 +21,18 @@
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="*"
-IUSE="ipu6se"
+IUSE="ipu6se ipu6ep"
 
 RDEPEND="
 	chromeos-base/chromeos-config-tools
 	chromeos-base/metrics
 	dev-libs/expat
-	!ipu6se? ( media-libs/intel-ipu6-libs-bin )
+	!ipu6se? ( !ipu6ep? ( media-libs/intel-ipu6-libs-bin ) )
 	ipu6se? (
 		media-libs/intel-ipu6se-libs-bin
 		x11-libs/libva-intel-media-driver
 	)
+	ipu6ep? ( media-libs/intel-ipu6ep-libs-bin )
 	!media-libs/cros-camera-hal-intel-ipu6-squash
 	media-libs/cros-camera-libcamera_client
 	media-libs/cros-camera-libcamera_common
diff --git a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r354.ebuild b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r355.ebuild
similarity index 90%
rename from media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r354.ebuild
rename to media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r355.ebuild
index e096736..84837c7 100644
--- a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r354.ebuild
+++ b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r355.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "51bed6c6697ad121ad0923e5473243d064aa91be" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "51bed6c6697ad121ad0923e5473243d064aa91be" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
 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-r748.ebuild b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r749.ebuild
similarity index 93%
rename from media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r748.ebuild
rename to media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r749.ebuild
index ce4f357..775ab0b 100644
--- a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r748.ebuild
+++ b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r749.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
 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-r451.ebuild b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r452.ebuild
similarity index 86%
rename from media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r451.ebuild
rename to media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r452.ebuild
index 094c777..c5de91a 100644
--- a/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r451.ebuild
+++ b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r452.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r467.ebuild b/media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r468.ebuild
similarity index 92%
rename from media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r467.ebuild
rename to media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r468.ebuild
index a511615..f94616b 100644
--- a/media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r467.ebuild
+++ b/media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r468.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r192.ebuild b/media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r193.ebuild
similarity index 82%
rename from media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r192.ebuild
rename to media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r193.ebuild
index 48d8eef..4406fb4 100644
--- a/media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r192.ebuild
+++ b/media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r193.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 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_client/cros-camera-libcamera_client-0.0.1-r266.ebuild b/media-libs/cros-camera-libcamera_client/cros-camera-libcamera_client-0.0.1-r267.ebuild
similarity index 91%
rename from media-libs/cros-camera-libcamera_client/cros-camera-libcamera_client-0.0.1-r266.ebuild
rename to media-libs/cros-camera-libcamera_client/cros-camera-libcamera_client-0.0.1-r267.ebuild
index 1de8bb5..da223e0 100644
--- a/media-libs/cros-camera-libcamera_client/cros-camera-libcamera_client-0.0.1-r266.ebuild
+++ b/media-libs/cros-camera-libcamera_client/cros-camera-libcamera_client-0.0.1-r267.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "e35f965a2c3451a2fe74ceb04da2875e20d17f95" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "e35f965a2c3451a2fe74ceb04da2875e20d17f95" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/android common-mk"
diff --git a/media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r453.ebuild b/media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r454.ebuild
similarity index 88%
rename from media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r453.ebuild
rename to media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r454.ebuild
index e8a57f2..56c1f10 100644
--- a/media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r453.ebuild
+++ b/media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r454.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 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/cros-camera-libcamera_connector-0.0.1-r155.ebuild b/media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r156.ebuild
similarity index 88%
rename from media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r155.ebuild
rename to media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r156.ebuild
index cb4f7de..877c8fb 100644
--- a/media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r155.ebuild
+++ b/media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r156.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r134.ebuild b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r135.ebuild
similarity index 84%
rename from media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r134.ebuild
rename to media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r135.ebuild
index 115c0ae..7411af2 100644
--- a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r134.ebuild
+++ b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r135.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 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_exif/cros-camera-libcamera_exif-0.0.1-r450.ebuild b/media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r451.ebuild
similarity index 85%
rename from media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r450.ebuild
rename to media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r451.ebuild
index fa7a2b3..87e01fb 100644
--- a/media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r450.ebuild
+++ b/media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r451.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 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_ipc/cros-camera-libcamera_ipc-0.0.1-r458.ebuild b/media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r459.ebuild
similarity index 89%
rename from media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r458.ebuild
rename to media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r459.ebuild
index c2f251d..c38c851 100644
--- a/media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r458.ebuild
+++ b/media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r459.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libcamera_metadata/cros-camera-libcamera_metadata-0.0.1-r266.ebuild b/media-libs/cros-camera-libcamera_metadata/cros-camera-libcamera_metadata-0.0.1-r267.ebuild
similarity index 91%
rename from media-libs/cros-camera-libcamera_metadata/cros-camera-libcamera_metadata-0.0.1-r266.ebuild
rename to media-libs/cros-camera-libcamera_metadata/cros-camera-libcamera_metadata-0.0.1-r267.ebuild
index c5cf152..ede53de 100644
--- a/media-libs/cros-camera-libcamera_metadata/cros-camera-libcamera_metadata-0.0.1-r266.ebuild
+++ b/media-libs/cros-camera-libcamera_metadata/cros-camera-libcamera_metadata-0.0.1-r267.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "e35f965a2c3451a2fe74ceb04da2875e20d17f95" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "e35f965a2c3451a2fe74ceb04da2875e20d17f95" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/android common-mk"
diff --git a/media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r450.ebuild b/media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r451.ebuild
similarity index 84%
rename from media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r450.ebuild
rename to media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r451.ebuild
index 56adc9c..c8db123 100644
--- a/media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r450.ebuild
+++ b/media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r451.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 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_v4l2_device/cros-camera-libcamera_v4l2_device-0.0.1-r327.ebuild b/media-libs/cros-camera-libcamera_v4l2_device/cros-camera-libcamera_v4l2_device-0.0.1-r328.ebuild
similarity index 84%
rename from media-libs/cros-camera-libcamera_v4l2_device/cros-camera-libcamera_v4l2_device-0.0.1-r327.ebuild
rename to media-libs/cros-camera-libcamera_v4l2_device/cros-camera-libcamera_v4l2_device-0.0.1-r328.ebuild
index 5c159d8..71602ba 100644
--- a/media-libs/cros-camera-libcamera_v4l2_device/cros-camera-libcamera_v4l2_device-0.0.1-r327.ebuild
+++ b/media-libs/cros-camera-libcamera_v4l2_device/cros-camera-libcamera_v4l2_device-0.0.1-r328.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "eb9df75b6c32a195902d080a694fe01bc4abca05" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "eb9df75b6c32a195902d080a694fe01bc4abca05" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common/v4l2_device camera/include common-mk"
diff --git a/media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r451.ebuild b/media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r452.ebuild
similarity index 85%
rename from media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r451.ebuild
rename to media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r452.ebuild
index 8cfd029..6f85349 100644
--- a/media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r451.ebuild
+++ b/media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r452.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 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/cros-camera-libjda-0.0.1-r524.ebuild b/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r525.ebuild
similarity index 88%
rename from media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r524.ebuild
rename to media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r525.ebuild
index 61995be..8c277bb 100644
--- a/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r524.ebuild
+++ b/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r525.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
 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-libjda_test/cros-camera-libjda_test-0.0.1-r454.ebuild b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r455.ebuild
similarity index 85%
rename from media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r454.ebuild
rename to media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r455.ebuild
index a9103df..9944c99 100644
--- a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r454.ebuild
+++ b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r455.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r501.ebuild b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r502.ebuild
similarity index 86%
rename from media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r501.ebuild
rename to media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r502.ebuild
index 623f7b6..7171a6b 100644
--- a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r501.ebuild
+++ b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r502.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="4170561bec558116fe6f6238606d27a8369180a5"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "8b709631d01f33411578061c0dd8bc0a0b243694")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "8b709631d01f33411578061c0dd8bc0a0b243694")
 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-test/cros-camera-test-0.0.1-r494.ebuild b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r495.ebuild
similarity index 93%
rename from media-libs/cros-camera-test/cros-camera-test-0.0.1-r494.ebuild
rename to media-libs/cros-camera-test/cros-camera-test-0.0.1-r495.ebuild
index e340a69..fd7beb6 100644
--- a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r494.ebuild
+++ b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r495.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="7eb13e0e581e693c766af5f9cfddb981b28fad1f"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "504b7623720b0320766830fbe53b0ea714498d55" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "504b7623720b0320766830fbe53b0ea714498d55" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 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-r326.ebuild b/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r327.ebuild
similarity index 90%
rename from media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r326.ebuild
rename to media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r327.ebuild
index 167097a..196a986 100644
--- a/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r326.ebuild
+++ b/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r327.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="88a8969559064ce035eea270adbb5ed5cf472bbb"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "316f9280ff87203d961bd29b773e08824f1c45d4" "c9de2eb52379383658eaf7cbc29fdb5d8d32eb98")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "33af14dee8d39c8e5b1ab60b776257b3dd3169f7" "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/net-print/cups_proxy/cups_proxy-0.0.1-r148.ebuild b/net-print/cups_proxy/cups_proxy-0.0.1-r149.ebuild
similarity index 91%
rename from net-print/cups_proxy/cups_proxy-0.0.1-r148.ebuild
rename to net-print/cups_proxy/cups_proxy-0.0.1-r149.ebuild
index 19fb06d..9b197e6 100644
--- a/net-print/cups_proxy/cups_proxy-0.0.1-r148.ebuild
+++ b/net-print/cups_proxy/cups_proxy-0.0.1-r149.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "6e5b8d8860aab37b0f9c1fa02030639cea55fb52" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "6e5b8d8860aab37b0f9c1fa02030639cea55fb52" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/sys-apps/fitpicker/fitpicker-0.0.1-r2082.ebuild b/sys-apps/fitpicker/fitpicker-0.0.1-r2083.ebuild
similarity index 85%
rename from sys-apps/fitpicker/fitpicker-0.0.1-r2082.ebuild
rename to sys-apps/fitpicker/fitpicker-0.0.1-r2083.ebuild
index 71d103e..074d721 100644
--- a/sys-apps/fitpicker/fitpicker-0.0.1-r2082.ebuild
+++ b/sys-apps/fitpicker/fitpicker-0.0.1-r2083.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "4ece3f8f3d85b6237e276452a02c7c6044463211" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "4ece3f8f3d85b6237e276452a02c7c6044463211" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_DESTDIR="${S}"
diff --git a/sys-apps/mosys/mosys-1.2.3-r1227.ebuild b/sys-apps/mosys/mosys-1.2.3-r1228.ebuild
similarity index 94%
rename from sys-apps/mosys/mosys-1.2.3-r1227.ebuild
rename to sys-apps/mosys/mosys-1.2.3-r1228.ebuild
index 5b6d566..14e1077 100644
--- a/sys-apps/mosys/mosys-1.2.3-r1227.ebuild
+++ b/sys-apps/mosys/mosys-1.2.3-r1228.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("df08dfaddce3638f899ba5ffffaf8994049a3c55" "5fcc8b925156ac3426a8e32ac800e99c5c2f0a47")
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "935ea194228ddd322d50e612476afa65e0eec201")
+CROS_WORKON_COMMIT=("b05e4a6b92b2cfe608b6cd8d5d37168680fc080e" "5fcc8b925156ac3426a8e32ac800e99c5c2f0a47")
+CROS_WORKON_TREE=("52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "935ea194228ddd322d50e612476afa65e0eec201")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"chromiumos/platform/mosys"