Marking set of ebuilds as stable

Cr-Build-Url: https://cr-buildbucket.appspot.com/build/8805918197253129265
Cr-Automation-Id: cros_source/push_uprevs
Change-Id: I0c5da5c3b0dc7c3cde44ccb492bc38c28b0d035e
diff --git a/chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r179.ebuild b/chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r180.ebuild
similarity index 92%
rename from chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r179.ebuild
rename to chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r180.ebuild
index 28de89f..c67a0219 100644
--- a/chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r179.ebuild
+++ b/chromeos-base/aosp-frameworks-ml-nn-vts/aosp-frameworks-ml-nn-vts-0.0.1-r180.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "a20bb10d95f22dc95f0f1779205b381f8c14569d" "181f7c798017c00372848000f4ba38b04936e5ab")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e982c0b168527570ec0e64866af23d7199ef2d42" "3ef88da49eee33eaeed09c00a9d40169450b7f5a")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "a20bb10d95f22dc95f0f1779205b381f8c14569d" "181f7c798017c00372848000f4ba38b04936e5ab")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e982c0b168527570ec0e64866af23d7199ef2d42" "3ef88da49eee33eaeed09c00a9d40169450b7f5a")
 inherit cros-constants
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r359.ebuild b/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r360.ebuild
similarity index 98%
rename from chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r359.ebuild
rename to chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r360.ebuild
index 4797c97..c7b895d 100644
--- a/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r359.ebuild
+++ b/chromeos-base/aosp-frameworks-ml-nn/aosp-frameworks-ml-nn-0.0.1-r360.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "a20bb10d95f22dc95f0f1779205b381f8c14569d" "181f7c798017c00372848000f4ba38b04936e5ab")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e982c0b168527570ec0e64866af23d7199ef2d42" "3ef88da49eee33eaeed09c00a9d40169450b7f5a")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "a20bb10d95f22dc95f0f1779205b381f8c14569d" "181f7c798017c00372848000f4ba38b04936e5ab")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e982c0b168527570ec0e64866af23d7199ef2d42" "3ef88da49eee33eaeed09c00a9d40169450b7f5a")
 inherit cros-constants
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/arc-adbd/arc-adbd-0.0.1-r499.ebuild b/chromeos-base/arc-adbd/arc-adbd-0.0.1-r500.ebuild
similarity index 83%
rename from chromeos-base/arc-adbd/arc-adbd-0.0.1-r499.ebuild
rename to chromeos-base/arc-adbd/arc-adbd-0.0.1-r500.ebuild
index 6ac0ce4..2c8ca7f 100644
--- a/chromeos-base/arc-adbd/arc-adbd-0.0.1-r499.ebuild
+++ b/chromeos-base/arc-adbd/arc-adbd-0.0.1-r500.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("514833ac35feb926ab49dcf952ef3768d02e9b84" "0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("514833ac35feb926ab49dcf952ef3768d02e9b84" "60fa47aebd6ebfb702012849bd560717fceddcd4" "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-r498.ebuild b/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r499.ebuild
similarity index 87%
rename from chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r498.ebuild
rename to chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r499.ebuild
index ecbdacf..2664da4 100644
--- a/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r498.ebuild
+++ b/chromeos-base/arc-apk-cache/arc-apk-cache-0.0.1-r499.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "ab6c050aa8c6ace38d371937e67cfb21e46fd899" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "ab6c050aa8c6ace38d371937e67cfb21e46fd899" "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-r432.ebuild b/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r433.ebuild
similarity index 88%
rename from chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r432.ebuild
rename to chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r433.ebuild
index 601e22d..0b626db 100644
--- a/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r432.ebuild
+++ b/chromeos-base/arc-appfuse/arc-appfuse-0.0.1-r433.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "575718e277c169d180cb6adc060050e72686b317" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "575718e277c169d180cb6adc060050e72686b317" "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-r510.ebuild b/chromeos-base/arc-base/arc-base-0.0.1-r511.ebuild
similarity index 95%
rename from chromeos-base/arc-base/arc-base-0.0.1-r510.ebuild
rename to chromeos-base/arc-base/arc-base-0.0.1-r511.ebuild
index 5a38205..4672586 100644
--- a/chromeos-base/arc-base/arc-base-0.0.1-r510.ebuild
+++ b/chromeos-base/arc-base/arc-base-0.0.1-r511.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e6009dda566e182775a3e0d822ab4ffbf051ee6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e6009dda566e182775a3e0d822ab4ffbf051ee6" "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-r299.ebuild b/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r300.ebuild
similarity index 89%
rename from chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r299.ebuild
rename to chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r300.ebuild
index cbff451..41e6a18 100644
--- a/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r299.ebuild
+++ b/chromeos-base/arc-common-scripts/arc-common-scripts-0.0.1-r300.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "434170aa6f4b0783eb80a76648f8e27f71b420fd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "434170aa6f4b0783eb80a76648f8e27f71b420fd" "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-r214.ebuild b/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r215.ebuild
similarity index 94%
rename from chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r214.ebuild
rename to chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r215.ebuild
index 82993e4..3f04f97 100644
--- a/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r214.ebuild
+++ b/chromeos-base/arc-data-snapshotd/arc-data-snapshotd-0.0.1-r215.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a51f6b6dd9d0e920cbe996f244873d1fb0c8a7bb" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a51f6b6dd9d0e920cbe996f244873d1fb0c8a7bb" "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-r173.ebuild b/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r174.ebuild
similarity index 87%
rename from chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r173.ebuild
rename to chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r174.ebuild
index 00db449..3267201 100644
--- a/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r173.ebuild
+++ b/chromeos-base/arc-host-clock-service/arc-host-clock-service-0.0.1-r174.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "cca15ee6031a3289ea3e45535963bb5874662caa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "cca15ee6031a3289ea3e45535963bb5874662caa" "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-r382.ebuild b/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r383.ebuild
similarity index 96%
rename from chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r382.ebuild
rename to chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r383.ebuild
index 9fa1d5cf..b219c57 100644
--- a/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r382.ebuild
+++ b/chromeos-base/arc-keymaster/arc-keymaster-0.0.1-r383.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "49dfc58d6c4c66f5d0b0d06f0161da4e602a1293")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "eb015c68db68f86b1e19e0200461bc65c136674b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "6dbc19849752c206e135ab59349ebb1cc62bb435")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "49dfc58d6c4c66f5d0b0d06f0161da4e602a1293")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "eb015c68db68f86b1e19e0200461bc65c136674b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "6dbc19849752c206e135ab59349ebb1cc62bb435")
 inherit cros-constants
 
 CROS_WORKON_INCREMENTAL_BUILD="1"
diff --git a/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r315.ebuild b/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r316.ebuild
similarity index 88%
rename from chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r315.ebuild
rename to chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r316.ebuild
index b36dd3c..5330dfd 100644
--- a/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r315.ebuild
+++ b/chromeos-base/arc-myfiles/arc-myfiles-0.0.1-r316.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "97bcfd3487dc7a09335f29f44fc38eaabf21e90b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "97bcfd3487dc7a09335f29f44fc38eaabf21e90b" "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-r576.ebuild b/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r577.ebuild
similarity index 91%
rename from chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r576.ebuild
rename to chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r577.ebuild
index 38980db..e447c8a 100644
--- a/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r576.ebuild
+++ b/chromeos-base/arc-obb-mounter/arc-obb-mounter-0.0.2-r577.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "4407bbb4129cf62cb6e764ecfdb34edc5fbe318e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "4407bbb4129cf62cb6e764ecfdb34edc5fbe318e" "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-r406.ebuild b/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r407.ebuild
similarity index 89%
rename from chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r406.ebuild
rename to chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r407.ebuild
index c231642..bae7a82 100644
--- a/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r406.ebuild
+++ b/chromeos-base/arc-removable-media/arc-removable-media-0.0.1-r407.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a668f1f1ed688f833488719ca2ccefc7e1e4272b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a668f1f1ed688f833488719ca2ccefc7e1e4272b" "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-r408.ebuild b/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r409.ebuild
similarity index 90%
rename from chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r408.ebuild
rename to chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r409.ebuild
index fb467e9..f9dc9e1 100644
--- a/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r408.ebuild
+++ b/chromeos-base/arc-sdcard/arc-sdcard-0.0.1-r409.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a050dd7c355cb42fde90fdb9c3c4334389d0acb5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a050dd7c355cb42fde90fdb9c3c4334389d0acb5" "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-r200.ebuild b/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r201.ebuild
similarity index 85%
rename from chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r200.ebuild
rename to chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r201.ebuild
index e16f328..6e5ad37 100644
--- a/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r200.ebuild
+++ b/chromeos-base/arc-sensor-service/arc-sensor-service-0.0.1-r201.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "cffb412aeb8981beccb3e710c15dbf0d33e790c6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "cffb412aeb8981beccb3e710c15dbf0d33e790c6" "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-r1599.ebuild b/chromeos-base/arc-setup/arc-setup-0.0.1-r1600.ebuild
similarity index 96%
rename from chromeos-base/arc-setup/arc-setup-0.0.1-r1599.ebuild
rename to chromeos-base/arc-setup/arc-setup-0.0.1-r1600.ebuild
index ebe1ba2..79f2780 100644
--- a/chromeos-base/arc-setup/arc-setup-0.0.1-r1599.ebuild
+++ b/chromeos-base/arc-setup/arc-setup-0.0.1-r1600.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "07cb07d94b34715810e1a88257031e7091d1a5f5" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "07cb07d94b34715810e1a88257031e7091d1a5f5" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r223.ebuild b/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r224.ebuild
similarity index 90%
rename from chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r223.ebuild
rename to chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r224.ebuild
index 467ab33..cc3d39c 100644
--- a/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r223.ebuild
+++ b/chromeos-base/arcvm-boot-notification-server/arcvm-boot-notification-server-0.0.1-r224.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "88e843cfa45c09f42d875d1276aa8c51d84540c6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "88e843cfa45c09f42d875d1276aa8c51d84540c6" "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-r261.ebuild b/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r262.ebuild
similarity index 92%
rename from chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r261.ebuild
rename to chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r262.ebuild
index e19eacd..dd43eac 100644
--- a/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r261.ebuild
+++ b/chromeos-base/arcvm-common-scripts/arcvm-common-scripts-0.0.1-r262.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "6c8e31ddd8673a4d0a97c41281778e94def0e37a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "6c8e31ddd8673a4d0a97c41281778e94def0e37a" "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-r161.ebuild b/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r162.ebuild
similarity index 88%
rename from chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r161.ebuild
rename to chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r162.ebuild
index 6110040..df6a32d 100644
--- a/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r161.ebuild
+++ b/chromeos-base/arcvm-mojo-proxy/arcvm-mojo-proxy-0.0.1-r162.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "9f169e2d15cb3a0fb7ed9bf55a6a443166e10796" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "9f169e2d15cb3a0fb7ed9bf55a6a443166e10796" "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-r184.ebuild b/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r185.ebuild
similarity index 88%
rename from chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r184.ebuild
rename to chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r185.ebuild
index 97059b0..f81ff54 100644
--- a/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r184.ebuild
+++ b/chromeos-base/arcvm-mount-media-dirs/arcvm-mount-media-dirs-0.0.1-r185.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "52a8dfd1ecf17b48fee49f656fc032c0fab03760" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "52a8dfd1ecf17b48fee49f656fc032c0fab03760" "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-r1089.ebuild b/chromeos-base/atrusctl/atrusctl-0.0.1-r1090.ebuild
similarity index 90%
rename from chromeos-base/atrusctl/atrusctl-0.0.1-r1089.ebuild
rename to chromeos-base/atrusctl/atrusctl-0.0.1-r1090.ebuild
index 79a9d2a..22aba8d 100644
--- a/chromeos-base/atrusctl/atrusctl-0.0.1-r1089.ebuild
+++ b/chromeos-base/atrusctl/atrusctl-0.0.1-r1090.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "4f1d81ecfa86ae7570f951fe6eaac9ab2c1290d7")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e791cbb573288deecc226b0d77ab4583fe9f747f")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "4f1d81ecfa86ae7570f951fe6eaac9ab2c1290d7")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e791cbb573288deecc226b0d77ab4583fe9f747f")
 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-r514.ebuild b/chromeos-base/attestation-client/attestation-client-0.0.1-r515.ebuild
similarity index 93%
rename from chromeos-base/attestation-client/attestation-client-0.0.1-r514.ebuild
rename to chromeos-base/attestation-client/attestation-client-0.0.1-r515.ebuild
index fb04a44..b8b7280 100644
--- a/chromeos-base/attestation-client/attestation-client-0.0.1-r514.ebuild
+++ b/chromeos-base/attestation-client/attestation-client-0.0.1-r515.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "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-r3624.ebuild b/chromeos-base/attestation/attestation-0.0.1-r3625.ebuild
similarity index 94%
rename from chromeos-base/attestation/attestation-0.0.1-r3624.ebuild
rename to chromeos-base/attestation/attestation-0.0.1-r3625.ebuild
index 6ed1088..28e69f0 100644
--- a/chromeos-base/attestation/attestation-0.0.1-r3624.ebuild
+++ b/chromeos-base/attestation/attestation-0.0.1-r3625.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "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-r1873.ebuild b/chromeos-base/authpolicy/authpolicy-0.0.1-r1874.ebuild
similarity index 94%
rename from chromeos-base/authpolicy/authpolicy-0.0.1-r1873.ebuild
rename to chromeos-base/authpolicy/authpolicy-0.0.1-r1874.ebuild
index 944ca9b..3968da1 100644
--- a/chromeos-base/authpolicy/authpolicy-0.0.1-r1873.ebuild
+++ b/chromeos-base/authpolicy/authpolicy-0.0.1-r1874.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "b264cb6b90c6ebf905cc374ca3ebd7011ea5fe8c" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "b264cb6b90c6ebf905cc374ca3ebd7011ea5fe8c" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3188.ebuild b/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3189.ebuild
similarity index 89%
rename from chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3188.ebuild
rename to chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3189.ebuild
index 762b02a..fbb1365 100644
--- a/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3188.ebuild
+++ b/chromeos-base/avtest_label_detect/avtest_label_detect-0.0.1-r3189.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "b263bb463cd5e0028ada4a34df829a60185da23a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "b263bb463cd5e0028ada4a34df829a60185da23a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"
diff --git a/chromeos-base/biod/biod-0.0.1-r2429.ebuild b/chromeos-base/biod/biod-0.0.1-r2430.ebuild
similarity index 95%
rename from chromeos-base/biod/biod-0.0.1-r2429.ebuild
rename to chromeos-base/biod/biod-0.0.1-r2430.ebuild
index 2938ad8..15f104e 100644
--- a/chromeos-base/biod/biod-0.0.1-r2429.ebuild
+++ b/chromeos-base/biod/biod-0.0.1-r2430.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "3e7613ea6e002e2ed9003c451537961ee1ec8c06" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "3e7613ea6e002e2ed9003c451537961ee1ec8c06" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r360.ebuild b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r361.ebuild
similarity index 86%
rename from chromeos-base/biod_proxy/biod_proxy-0.0.1-r360.ebuild
rename to chromeos-base/biod_proxy/biod_proxy-0.0.1-r361.ebuild
index cde79eb..ccb63b0 100644
--- a/chromeos-base/biod_proxy/biod_proxy-0.0.1-r360.ebuild
+++ b/chromeos-base/biod_proxy/biod_proxy-0.0.1-r361.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "3e7613ea6e002e2ed9003c451537961ee1ec8c06" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "3e7613ea6e002e2ed9003c451537961ee1ec8c06" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/bootid-logger/bootid-logger-0.0.1-r207.ebuild b/chromeos-base/bootid-logger/bootid-logger-0.0.1-r208.ebuild
similarity index 89%
rename from chromeos-base/bootid-logger/bootid-logger-0.0.1-r207.ebuild
rename to chromeos-base/bootid-logger/bootid-logger-0.0.1-r208.ebuild
index 4abd9e2..dd315ea 100644
--- a/chromeos-base/bootid-logger/bootid-logger-0.0.1-r207.ebuild
+++ b/chromeos-base/bootid-logger/bootid-logger-0.0.1-r208.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "83ca22e88798e1cc90cb146bff627f7dca4893bc" "8ef7c6aabe0a8edeff8f6030f7c1b79ab3e32522" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "83ca22e88798e1cc90cb146bff627f7dca4893bc" "8ef7c6aabe0a8edeff8f6030f7c1b79ab3e32522" "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-r1880.ebuild b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1881.ebuild
similarity index 91%
rename from chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1880.ebuild
rename to chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1881.ebuild
index 5f6dae8..6dff4e4 100644
--- a/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1880.ebuild
+++ b/chromeos-base/bootlockbox-client/bootlockbox-client-0.0.1-r1881.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "cae4613fb762e98fcafc23166e621aaa667b6729" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "cae4613fb762e98fcafc23166e621aaa667b6729" "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-r3234.ebuild b/chromeos-base/bootstat/bootstat-0.0.2-r3235.ebuild
similarity index 86%
rename from chromeos-base/bootstat/bootstat-0.0.2-r3234.ebuild
rename to chromeos-base/bootstat/bootstat-0.0.2-r3235.ebuild
index c9fbd4a..67e6ae7 100644
--- a/chromeos-base/bootstat/bootstat-0.0.2-r3234.ebuild
+++ b/chromeos-base/bootstat/bootstat-0.0.2-r3235.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "05c88bcfecc640205a21834d7f46a3d1e651f111" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "05c88bcfecc640205a21834d7f46a3d1e651f111" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/cbor/cbor-0.0.1-r221.ebuild b/chromeos-base/cbor/cbor-0.0.1-r222.ebuild
similarity index 90%
rename from chromeos-base/cbor/cbor-0.0.1-r221.ebuild
rename to chromeos-base/cbor/cbor-0.0.1-r222.ebuild
index 1e42295..60767af 100644
--- a/chromeos-base/cbor/cbor-0.0.1-r221.ebuild
+++ b/chromeos-base/cbor/cbor-0.0.1-r222.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "35fe21779fddc0d376da13dab49e31fa3491205f")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fa22c2326c89f0ccbecf5d2e3635701867e62b85")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "35fe21779fddc0d376da13dab49e31fa3491205f")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fa22c2326c89f0ccbecf5d2e3635701867e62b85")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"chromiumos/platform/cbor"
diff --git a/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r217.ebuild b/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r218.ebuild
similarity index 88%
rename from chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r217.ebuild
rename to chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r218.ebuild
index b60db25..11eea20 100644
--- a/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r217.ebuild
+++ b/chromeos-base/cfm-dfu-notification/cfm-dfu-notification-0.0.1-r218.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "63862a9eebc1145ee434295657abeeefaf884645" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "63862a9eebc1145ee434295657abeeefaf884645" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/chaps-client/chaps-client-0.0.1-r143.ebuild b/chromeos-base/chaps-client/chaps-client-0.0.1-r144.ebuild
similarity index 90%
rename from chromeos-base/chaps-client/chaps-client-0.0.1-r143.ebuild
rename to chromeos-base/chaps-client/chaps-client-0.0.1-r144.ebuild
index 60b9229..ff7d14b 100644
--- a/chromeos-base/chaps-client/chaps-client-0.0.1-r143.ebuild
+++ b/chromeos-base/chaps-client/chaps-client-0.0.1-r144.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/chaps/chaps-0.0.1-r3767.ebuild b/chromeos-base/chaps/chaps-0.0.1-r3768.ebuild
similarity index 96%
rename from chromeos-base/chaps/chaps-0.0.1-r3767.ebuild
rename to chromeos-base/chaps/chaps-0.0.1-r3768.ebuild
index 7f0851f..ed9c4b8 100644
--- a/chromeos-base/chaps/chaps-0.0.1-r3767.ebuild
+++ b/chromeos-base/chaps/chaps-0.0.1-r3768.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "944879c9353c2df8adb7022407a8d319671325c1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "944879c9353c2df8adb7022407a8d319671325c1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/chargesplash/chargesplash-0.0.1-r32.ebuild b/chromeos-base/chargesplash/chargesplash-0.0.1-r33.ebuild
similarity index 86%
rename from chromeos-base/chargesplash/chargesplash-0.0.1-r32.ebuild
rename to chromeos-base/chargesplash/chargesplash-0.0.1-r33.ebuild
index 9a3eeef..a5f27b4 100644
--- a/chromeos-base/chargesplash/chargesplash-0.0.1-r32.ebuild
+++ b/chromeos-base/chargesplash/chargesplash-0.0.1-r33.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "83e2bdd8b74ac9fdb0c801679693d2bb0745064c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "83e2bdd8b74ac9fdb0c801679693d2bb0745064c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r399.ebuild b/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r400.ebuild
similarity index 91%
rename from chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r399.ebuild
rename to chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r400.ebuild
index 70bc94f..675b607 100644
--- a/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r399.ebuild
+++ b/chromeos-base/chromeos-common-script/chromeos-common-script-0.0.1-r400.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "777454ed89f9fb3a7f25a3f844449983a1f6c3fa" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "777454ed89f9fb3a7f25a3f844449983a1f6c3fa" "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-r2141.ebuild b/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2142.ebuild
similarity index 91%
rename from chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2141.ebuild
rename to chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2142.ebuild
index 3df0177..91b3680 100644
--- a/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2141.ebuild
+++ b/chromeos-base/chromeos-config-tools/chromeos-config-tools-0.0.4-r2142.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "a1298a3f48a90fb72cefbd674ebb0fcef18c214f")
-CROS_WORKON_TREE=("4fdfdbe461ccedeaaf176391c0bbb0f74943be45" "0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "0bb1188da737e1a0399457e852e32dc8cfba2567" "f87095b8c1a06b38a8fe4183b31cdf15821ac9a1")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "a1298a3f48a90fb72cefbd674ebb0fcef18c214f")
+CROS_WORKON_TREE=("4fdfdbe461ccedeaaf176391c0bbb0f74943be45" "60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "0bb1188da737e1a0399457e852e32dc8cfba2567" "f87095b8c1a06b38a8fe4183b31cdf15821ac9a1")
 CROS_WORKON_INCREMENTAL_BUILD=1
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3252.ebuild b/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3253.ebuild
similarity index 90%
rename from chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3252.ebuild
rename to chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3253.ebuild
index 6638802..ff95b5d 100644
--- a/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3252.ebuild
+++ b/chromeos-base/chromeos-imageburner/chromeos-imageburner-0.0.1-r3253.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "7de555b069d818f590b242435b6c4ec9630b8ead" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "7de555b069d818f590b242435b6c4ec9630b8ead" "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-r4581.ebuild b/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4582.ebuild
similarity index 97%
rename from chromeos-base/chromeos-init/chromeos-init-0.0.25-r4581.ebuild
rename to chromeos-base/chromeos-init/chromeos-init-0.0.25-r4582.ebuild
index 1ebff2b..ea1e692 100644
--- a/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4581.ebuild
+++ b/chromeos-base/chromeos-init/chromeos-init-0.0.25-r4582.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "9f635b4066a77f92e74cc7d80516960224bdf700" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "9f635b4066a77f92e74cc7d80516960224bdf700" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r3669.ebuild b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3670.ebuild
similarity index 92%
rename from chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3669.ebuild
rename to chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3670.ebuild
index 6ee8bed..9cdb564 100644
--- a/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3669.ebuild
+++ b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3670.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("527abd7a988a45572305a6c44b5324d0d9cf8be2" "0db6495c85c9186f120853ea040436bf4259ef96" "aec60c261c19c132b6dda00ed40f61717c823a15" "a65107acb3c4cbbae51687d8409856f07b5dda27" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("527abd7a988a45572305a6c44b5324d0d9cf8be2" "60fa47aebd6ebfb702012849bd560717fceddcd4" "aec60c261c19c132b6dda00ed40f61717c823a15" "a65107acb3c4cbbae51687d8409856f07b5dda27" "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-r5082.ebuild b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r5083.ebuild
similarity index 96%
rename from chromeos-base/chromeos-login/chromeos-login-0.0.2-r5082.ebuild
rename to chromeos-base/chromeos-login/chromeos-login-0.0.2-r5083.ebuild
index 32068bc..1ab6d72 100644
--- a/chromeos-base/chromeos-login/chromeos-login-0.0.2-r5082.ebuild
+++ b/chromeos-base/chromeos-login/chromeos-login-0.0.2-r5083.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "86c7faad3e91503ff0fd5d28ede2e13016668322" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "86c7faad3e91503ff0fd5d28ede2e13016668322" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r387.ebuild b/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r388.ebuild
similarity index 88%
rename from chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r387.ebuild
rename to chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r388.ebuild
index 6993040a..3898ec8 100644
--- a/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r387.ebuild
+++ b/chromeos-base/chromeos-storage-info/chromeos-storage-info-0.0.1-r388.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f008fb9e266cb811b8604fca21e59d8114dab267" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f008fb9e266cb811b8604fca21e59d8114dab267" "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-r1767.ebuild b/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1768.ebuild
similarity index 88%
rename from chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1767.ebuild
rename to chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1768.ebuild
index ce17dc5..9ee8792 100644
--- a/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1767.ebuild
+++ b/chromeos-base/chromeos-trim/chromeos-trim-0.0.1-r1768.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "1e69ede3d074afd135fa6f2136ea5d99c425702b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "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-r270.ebuild b/chromeos-base/codelab/codelab-0.0.1-r271.ebuild
similarity index 85%
rename from chromeos-base/codelab/codelab-0.0.1-r270.ebuild
rename to chromeos-base/codelab/codelab-0.0.1-r271.ebuild
index 1cb4761..c2b4a46 100644
--- a/chromeos-base/codelab/codelab-0.0.1-r270.ebuild
+++ b/chromeos-base/codelab/codelab-0.0.1-r271.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "0bb4f1d027f4fd2368775ade6c2d929e5773cdf8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "0bb4f1d027f4fd2368775ade6c2d929e5773cdf8" "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-r3845.ebuild b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3846.ebuild
similarity index 97%
rename from chromeos-base/crash-reporter/crash-reporter-0.0.1-r3845.ebuild
rename to chromeos-base/crash-reporter/crash-reporter-0.0.1-r3846.ebuild
index e1e0747..b61e2b2 100644
--- a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3845.ebuild
+++ b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3846.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "b6de0ed9bf68f24a62063f5dd296e2f6c23120cb" "3b33fc07daf512e548300eefbd028b622bc51b44" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "b6de0ed9bf68f24a62063f5dd296e2f6c23120cb" "3b33fc07daf512e548300eefbd028b622bc51b44" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r154.ebuild b/chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r155.ebuild
similarity index 92%
rename from chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r154.ebuild
rename to chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r155.ebuild
index 25fc318..9826147 100644
--- a/chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r154.ebuild
+++ b/chromeos-base/cros-camera-android-deps/cros-camera-android-deps-0.0.1-r155.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "efe904e8c621b150b9937196a1b506dfbdc10ece" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "efe904e8c621b150b9937196a1b506dfbdc10ece" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/android common-mk"
diff --git a/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r555.ebuild b/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r556.ebuild
similarity index 95%
rename from chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r555.ebuild
rename to chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r556.ebuild
index ce51002..f4f01eb 100644
--- a/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r555.ebuild
+++ b/chromeos-base/cros-camera-libs/cros-camera-libs-0.0.1-r556.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "29d52c6d2464057e3fde8214a173f96d96f3b267" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "29d52c6d2464057e3fde8214a173f96d96f3b267" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn common-mk metrics camera/build camera/common camera/features camera/gpu camera/include camera/mojo chromeos-config iioservice/libiioservice_ipc iioservice/mojo"
diff --git a/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r471.ebuild b/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r472.ebuild
similarity index 82%
rename from chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r471.ebuild
rename to chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r472.ebuild
index 2a04726..b9d7d3d 100644
--- a/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r471.ebuild
+++ b/chromeos-base/cros-camera-tool/cros-camera-tool-0.0.1-r472.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "2de57cadefcee72268944188060875f71560d058" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "2de57cadefcee72268944188060875f71560d058" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/tools camera/include common-mk"
diff --git a/chromeos-base/cros-camera/cros-camera-0.0.1-r1272.ebuild b/chromeos-base/cros-camera/cros-camera-0.0.1-r1273.ebuild
similarity index 95%
rename from chromeos-base/cros-camera/cros-camera-0.0.1-r1272.ebuild
rename to chromeos-base/cros-camera/cros-camera-0.0.1-r1273.ebuild
index 1903e4a..bac5204 100644
--- a/chromeos-base/cros-camera/cros-camera-0.0.1-r1272.ebuild
+++ b/chromeos-base/cros-camera/cros-camera-0.0.1-r1273.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "b0ccef63d93d3f8d215dd201788aeebd15619f07" "c3c40f3f84e84244b8835207266a7094fa70773a" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "b0ccef63d93d3f8d215dd201788aeebd15619f07" "c3c40f3f84e84244b8835207266a7094fa70773a" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 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-r3514.ebuild b/chromeos-base/cros-disks/cros-disks-0.0.1-r3515.ebuild
similarity index 96%
rename from chromeos-base/cros-disks/cros-disks-0.0.1-r3514.ebuild
rename to chromeos-base/cros-disks/cros-disks-0.0.1-r3515.ebuild
index bc8bb09..0aa12ac 100644
--- a/chromeos-base/cros-disks/cros-disks-0.0.1-r3514.ebuild
+++ b/chromeos-base/cros-disks/cros-disks-0.0.1-r3515.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "8f2675a7fb1f6b8b5dda4c1070aaa0b8de796429" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "8f2675a7fb1f6b8b5dda4c1070aaa0b8de796429" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r160.ebuild b/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r161.ebuild
similarity index 91%
rename from chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r160.ebuild
rename to chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r161.ebuild
index 85b4fca1..37329d9 100644
--- a/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r160.ebuild
+++ b/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r161.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f459f35d773d50b41d55dd786c61923bd27f2f92"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "22e73209a1f442bdb7f51b01281a5e5bae946c16" "ce7778d24b2f9bde8061cc085b6bd204ef4b8a9e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "22e73209a1f442bdb7f51b01281a5e5bae946c16" "ce7778d24b2f9bde8061cc085b6bd204ef4b8a9e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/crosdns/crosdns-0.0.2-r415.ebuild b/chromeos-base/crosdns/crosdns-0.0.2-r416.ebuild
similarity index 92%
rename from chromeos-base/crosdns/crosdns-0.0.2-r415.ebuild
rename to chromeos-base/crosdns/crosdns-0.0.2-r416.ebuild
index 88ea292..bacaeec 100644
--- a/chromeos-base/crosdns/crosdns-0.0.2-r415.ebuild
+++ b/chromeos-base/crosdns/crosdns-0.0.2-r416.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "8ef13102d74ef6d7591c8da21fadd38830971769" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "8ef13102d74ef6d7591c8da21fadd38830971769" "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-r360.ebuild b/chromeos-base/croslog/croslog-0.0.1-r361.ebuild
similarity index 88%
rename from chromeos-base/croslog/croslog-0.0.1-r360.ebuild
rename to chromeos-base/croslog/croslog-0.0.1-r361.ebuild
index 348a241..864755d 100644
--- a/chromeos-base/croslog/croslog-0.0.1-r360.ebuild
+++ b/chromeos-base/croslog/croslog-0.0.1-r361.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "8ef7c6aabe0a8edeff8f6030f7c1b79ab3e32522" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "8ef7c6aabe0a8edeff8f6030f7c1b79ab3e32522" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r2063.ebuild b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2064.ebuild
similarity index 90%
rename from chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2063.ebuild
rename to chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2064.ebuild
index 1da85b7..1ca2a85 100644
--- a/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2063.ebuild
+++ b/chromeos-base/cryptohome-client/cryptohome-client-0.0.1-r2064.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "cae4613fb762e98fcafc23166e621aaa667b6729" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "cae4613fb762e98fcafc23166e621aaa667b6729" "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-r1926.ebuild b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1927.ebuild
similarity index 92%
rename from chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1926.ebuild
rename to chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1927.ebuild
index 5c1c425..0d6fe27 100644
--- a/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1926.ebuild
+++ b/chromeos-base/cryptohome-dev-utils/cryptohome-dev-utils-0.0.1-r1927.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "cae4613fb762e98fcafc23166e621aaa667b6729" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "cae4613fb762e98fcafc23166e621aaa667b6729" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/cryptohome/cryptohome-0.0.1-r4469.ebuild b/chromeos-base/cryptohome/cryptohome-0.0.1-r4470.ebuild
similarity index 97%
rename from chromeos-base/cryptohome/cryptohome-0.0.1-r4469.ebuild
rename to chromeos-base/cryptohome/cryptohome-0.0.1-r4470.ebuild
index 7efe172..67b85ca 100644
--- a/chromeos-base/cryptohome/cryptohome-0.0.1-r4469.ebuild
+++ b/chromeos-base/cryptohome/cryptohome-0.0.1-r4470.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "cae4613fb762e98fcafc23166e621aaa667b6729" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "cae4613fb762e98fcafc23166e621aaa667b6729" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "1454f5ebf6a159645127c22d8c4e382e8752569d" "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-r2281.ebuild b/chromeos-base/debugd-client/debugd-client-0.0.1-r2282.ebuild
similarity index 90%
rename from chromeos-base/debugd-client/debugd-client-0.0.1-r2281.ebuild
rename to chromeos-base/debugd-client/debugd-client-0.0.1-r2282.ebuild
index 9fdb0f2..283e8e3 100644
--- a/chromeos-base/debugd-client/debugd-client-0.0.1-r2281.ebuild
+++ b/chromeos-base/debugd-client/debugd-client-0.0.1-r2282.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "96c52c174043d3401aeade9ce7790f8488305677" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "96c52c174043d3401aeade9ce7790f8488305677" "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-r3348.ebuild b/chromeos-base/debugd/debugd-0.0.1-r3349.ebuild
similarity index 96%
rename from chromeos-base/debugd/debugd-0.0.1-r3348.ebuild
rename to chromeos-base/debugd/debugd-0.0.1-r3349.ebuild
index fe072a6..9b5626e 100644
--- a/chromeos-base/debugd/debugd-0.0.1-r3348.ebuild
+++ b/chromeos-base/debugd/debugd-0.0.1-r3349.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "96c52c174043d3401aeade9ce7790f8488305677" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "96c52c174043d3401aeade9ce7790f8488305677" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r1342.ebuild b/chromeos-base/dev-install/dev-install-0.0.1-r1343.ebuild
similarity index 94%
rename from chromeos-base/dev-install/dev-install-0.0.1-r1342.ebuild
rename to chromeos-base/dev-install/dev-install-0.0.1-r1343.ebuild
index cd7dce5..1d58f5f 100644
--- a/chromeos-base/dev-install/dev-install-0.0.1-r1342.ebuild
+++ b/chromeos-base/dev-install/dev-install-0.0.1-r1343.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "42d7c5735687e4d0b875e7985955ca1da771f93f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "42d7c5735687e4d0b875e7985955ca1da771f93f" "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-r1024.ebuild b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1025.ebuild
similarity index 88%
rename from chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1024.ebuild
rename to chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1025.ebuild
index 3a4527c..92214a2 100644
--- a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1024.ebuild
+++ b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r1025.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="f459f35d773d50b41d55dd786c61923bd27f2f92"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "41a4e9c452d2b7f10b9f7cd31aa95d3998ea8454" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "41a4e9c452d2b7f10b9f7cd31aa95d3998ea8454" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r148.ebuild b/chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r149.ebuild
similarity index 85%
rename from chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r148.ebuild
rename to chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r149.ebuild
index 1b7a425..ea9120d 100644
--- a/chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r148.ebuild
+++ b/chromeos-base/diagnostics-test/diagnostics-test-0.0.1-r149.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f459f35d773d50b41d55dd786c61923bd27f2f92"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "41a4e9c452d2b7f10b9f7cd31aa95d3998ea8454" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "41a4e9c452d2b7f10b9f7cd31aa95d3998ea8454" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/diagnostics/diagnostics-0.0.1-r1470.ebuild b/chromeos-base/diagnostics/diagnostics-0.0.1-r1471.ebuild
similarity index 94%
rename from chromeos-base/diagnostics/diagnostics-0.0.1-r1470.ebuild
rename to chromeos-base/diagnostics/diagnostics-0.0.1-r1471.ebuild
index c39775e..391681f 100644
--- a/chromeos-base/diagnostics/diagnostics-0.0.1-r1470.ebuild
+++ b/chromeos-base/diagnostics/diagnostics-0.0.1-r1471.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f459f35d773d50b41d55dd786c61923bd27f2f92"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "41a4e9c452d2b7f10b9f7cd31aa95d3998ea8454" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "41a4e9c452d2b7f10b9f7cd31aa95d3998ea8454" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/discod/discod-0.0.1-r16.ebuild b/chromeos-base/discod/discod-0.0.1-r17.ebuild
similarity index 89%
rename from chromeos-base/discod/discod-0.0.1-r16.ebuild
rename to chromeos-base/discod/discod-0.0.1-r17.ebuild
index c9aee72..a12def2 100644
--- a/chromeos-base/discod/discod-0.0.1-r16.ebuild
+++ b/chromeos-base/discod/discod-0.0.1-r17.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "8b4967427a3d2dad96feaf0caf2e514e9e6f052e" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "8b4967427a3d2dad96feaf0caf2e514e9e6f052e" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/disk_updater/disk_updater-0.0.1-r3198.ebuild b/chromeos-base/disk_updater/disk_updater-0.0.1-r3199.ebuild
similarity index 90%
rename from chromeos-base/disk_updater/disk_updater-0.0.1-r3198.ebuild
rename to chromeos-base/disk_updater/disk_updater-0.0.1-r3199.ebuild
index 6e1911b..d80f7d3 100644
--- a/chromeos-base/disk_updater/disk_updater-0.0.1-r3198.ebuild
+++ b/chromeos-base/disk_updater/disk_updater-0.0.1-r3199.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "7222defad0516675cbd74df61b74d388be5eae64" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "7222defad0516675cbd74df61b74d388be5eae64" "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-r601.ebuild b/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r602.ebuild
similarity index 88%
rename from chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r601.ebuild
rename to chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r602.ebuild
index 69e8aac..e52f4aa 100644
--- a/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r601.ebuild
+++ b/chromeos-base/dlcservice-client/dlcservice-client-0.0.1-r602.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "be66f552f2c2ee937edafa582658f67dad6bf29e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "be66f552f2c2ee937edafa582658f67dad6bf29e" "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-r795.ebuild b/chromeos-base/dlcservice/dlcservice-0.0.1-r796.ebuild
similarity index 94%
rename from chromeos-base/dlcservice/dlcservice-0.0.1-r795.ebuild
rename to chromeos-base/dlcservice/dlcservice-0.0.1-r796.ebuild
index e216a75..3fdbaca 100644
--- a/chromeos-base/dlcservice/dlcservice-0.0.1-r795.ebuild
+++ b/chromeos-base/dlcservice/dlcservice-0.0.1-r796.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "be66f552f2c2ee937edafa582658f67dad6bf29e" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "be66f552f2c2ee937edafa582658f67dad6bf29e" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/dlp/dlp-0.0.1-r167.ebuild b/chromeos-base/dlp/dlp-0.0.1-r168.ebuild
similarity index 93%
rename from chromeos-base/dlp/dlp-0.0.1-r167.ebuild
rename to chromeos-base/dlp/dlp-0.0.1-r168.ebuild
index be3ddc2..abefef1 100644
--- a/chromeos-base/dlp/dlp-0.0.1-r167.ebuild
+++ b/chromeos-base/dlp/dlp-0.0.1-r168.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "179a073f51a15a90cbbdf56fba124d9d71ba4c92" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "179a073f51a15a90cbbdf56fba124d9d71ba4c92" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/dns-proxy/dns-proxy-0.0.1-r344.ebuild b/chromeos-base/dns-proxy/dns-proxy-0.0.1-r345.ebuild
similarity index 93%
rename from chromeos-base/dns-proxy/dns-proxy-0.0.1-r344.ebuild
rename to chromeos-base/dns-proxy/dns-proxy-0.0.1-r345.ebuild
index 5fb677a..55116f1 100644
--- a/chromeos-base/dns-proxy/dns-proxy-0.0.1-r344.ebuild
+++ b/chromeos-base/dns-proxy/dns-proxy-0.0.1-r345.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "235fefd7a1a3627928bea9ea768909f97eb5a889" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "62f84a7b4216d539df553a5bafe00d85969a9f63" "bf11ffe5bade82cef5574e57f94fd0e7e38b716c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "235fefd7a1a3627928bea9ea768909f97eb5a889" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "62f84a7b4216d539df553a5bafe00d85969a9f63" "bf11ffe5bade82cef5574e57f94fd0e7e38b716c" "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-r3101.ebuild b/chromeos-base/easy-unlock/easy-unlock-0.0.1-r3102.ebuild
similarity index 88%
rename from chromeos-base/easy-unlock/easy-unlock-0.0.1-r3101.ebuild
rename to chromeos-base/easy-unlock/easy-unlock-0.0.1-r3102.ebuild
index 5853f7a..1571a53 100644
--- a/chromeos-base/easy-unlock/easy-unlock-0.0.1-r3101.ebuild
+++ b/chromeos-base/easy-unlock/easy-unlock-0.0.1-r3102.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "ead09467b3f58a6e812f692940d708f1c286b94d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "ead09467b3f58a6e812f692940d708f1c286b94d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r294.ebuild b/chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r295.ebuild
similarity index 91%
rename from chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r294.ebuild
rename to chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r295.ebuild
index fe519ef..648b30a 100644
--- a/chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r294.ebuild
+++ b/chromeos-base/factory_runtime_probe/factory_runtime_probe-0.0.1-r295.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/feature_usage/feature_usage-0.0.1-r78.ebuild b/chromeos-base/feature_usage/feature_usage-0.0.1-r79.ebuild
similarity index 89%
rename from chromeos-base/feature_usage/feature_usage-0.0.1-r78.ebuild
rename to chromeos-base/feature_usage/feature_usage-0.0.1-r79.ebuild
index cac82b7..a7d0314 100644
--- a/chromeos-base/feature_usage/feature_usage-0.0.1-r78.ebuild
+++ b/chromeos-base/feature_usage/feature_usage-0.0.1-r79.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "9487cb70b8720982545a04ade6a4f464cdde53ac" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "9487cb70b8720982545a04ade6a4f464cdde53ac" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/featured/featured-0.0.1-r125.ebuild b/chromeos-base/featured/featured-0.0.1-r126.ebuild
similarity index 92%
rename from chromeos-base/featured/featured-0.0.1-r125.ebuild
rename to chromeos-base/featured/featured-0.0.1-r126.ebuild
index ac31ad8..0d38291 100644
--- a/chromeos-base/featured/featured-0.0.1-r125.ebuild
+++ b/chromeos-base/featured/featured-0.0.1-r126.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "545d67a6429090226f1d6ac899f5f2d86bd38b99" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "545d67a6429090226f1d6ac899f5f2d86bd38b99" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/federated-service/federated-service-0.0.1-r143.ebuild b/chromeos-base/federated-service/federated-service-0.0.1-r144.ebuild
similarity index 91%
rename from chromeos-base/federated-service/federated-service-0.0.1-r143.ebuild
rename to chromeos-base/federated-service/federated-service-0.0.1-r144.ebuild
index 2051bba..09210d9 100644
--- a/chromeos-base/federated-service/federated-service-0.0.1-r143.ebuild
+++ b/chromeos-base/federated-service/federated-service-0.0.1-r144.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "01406a223aab1eb5a4a224b0e216d352c178037f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "01406a223aab1eb5a4a224b0e216d352c178037f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/feedback/feedback-0.0.1-r939.ebuild b/chromeos-base/feedback/feedback-0.0.1-r940.ebuild
similarity index 85%
rename from chromeos-base/feedback/feedback-0.0.1-r939.ebuild
rename to chromeos-base/feedback/feedback-0.0.1-r940.ebuild
index f46bd02..9eea571 100644
--- a/chromeos-base/feedback/feedback-0.0.1-r939.ebuild
+++ b/chromeos-base/feedback/feedback-0.0.1-r940.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "5395cfe3ef077195924f7da08cada1ec5b1ded6d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "5395cfe3ef077195924f7da08cada1ec5b1ded6d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/flex_id/flex_id-0.0.1-r57.ebuild b/chromeos-base/flex_id/flex_id-0.0.1-r58.ebuild
similarity index 85%
rename from chromeos-base/flex_id/flex_id-0.0.1-r57.ebuild
rename to chromeos-base/flex_id/flex_id-0.0.1-r58.ebuild
index 216ebc3..3eddb7c 100644
--- a/chromeos-base/flex_id/flex_id-0.0.1-r57.ebuild
+++ b/chromeos-base/flex_id/flex_id-0.0.1-r58.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "c5a49444cc51d4d5d217c797f33502ff7e8a3dbc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "c5a49444cc51d4d5d217c797f33502ff7e8a3dbc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r178.ebuild b/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r179.ebuild
similarity index 88%
rename from chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r178.ebuild
rename to chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r179.ebuild
index ece0026..4a4d2cc 100644
--- a/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r178.ebuild
+++ b/chromeos-base/foomatic_shell/foomatic_shell-0.0.1-r179.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "3b4d7f82f5d68f35d2412d679e794ec15a3a45e0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "3b4d7f82f5d68f35d2412d679e794ec15a3a45e0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/fusebox/fusebox-0.0.2-r236.ebuild b/chromeos-base/fusebox/fusebox-0.0.2-r237.ebuild
similarity index 89%
rename from chromeos-base/fusebox/fusebox-0.0.2-r236.ebuild
rename to chromeos-base/fusebox/fusebox-0.0.2-r237.ebuild
index 4b6a406..edf16c4 100644
--- a/chromeos-base/fusebox/fusebox-0.0.2-r236.ebuild
+++ b/chromeos-base/fusebox/fusebox-0.0.2-r237.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "86c75ff12317f1fc3eae5f0d87b89682b86dd88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "86c75ff12317f1fc3eae5f0d87b89682b86dd88e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/g2f_tools/g2f_tools-0.0.1-r893.ebuild b/chromeos-base/g2f_tools/g2f_tools-0.0.1-r894.ebuild
similarity index 90%
rename from chromeos-base/g2f_tools/g2f_tools-0.0.1-r893.ebuild
rename to chromeos-base/g2f_tools/g2f_tools-0.0.1-r894.ebuild
index 42ef7b3..302bbb1 100644
--- a/chromeos-base/g2f_tools/g2f_tools-0.0.1-r893.ebuild
+++ b/chromeos-base/g2f_tools/g2f_tools-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="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "b5881b78580dbead29183a70fdc260387f29d82a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "b5881b78580dbead29183a70fdc260387f29d82a" "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-r321.ebuild b/chromeos-base/glib-bridge/glib-bridge-0.0.1-r322.ebuild
similarity index 88%
rename from chromeos-base/glib-bridge/glib-bridge-0.0.1-r321.ebuild
rename to chromeos-base/glib-bridge/glib-bridge-0.0.1-r322.ebuild
index 4f8a918..4e6d697 100644
--- a/chromeos-base/glib-bridge/glib-bridge-0.0.1-r321.ebuild
+++ b/chromeos-base/glib-bridge/glib-bridge-0.0.1-r322.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "36dc2ec558e1f7491a9167556fd841be0c78aec5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "36dc2ec558e1f7491a9167556fd841be0c78aec5" "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-r625.ebuild b/chromeos-base/goldfishd/goldfishd-0.0.1-r626.ebuild
similarity index 85%
rename from chromeos-base/goldfishd/goldfishd-0.0.1-r625.ebuild
rename to chromeos-base/goldfishd/goldfishd-0.0.1-r626.ebuild
index 442393f..8f01aa2 100644
--- a/chromeos-base/goldfishd/goldfishd-0.0.1-r625.ebuild
+++ b/chromeos-base/goldfishd/goldfishd-0.0.1-r626.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "d73e948ee4d98ed9a0b228cf85588b9ceeae13c3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "d73e948ee4d98ed9a0b228cf85588b9ceeae13c3" "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-r702.ebuild b/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r703.ebuild
similarity index 90%
rename from chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r702.ebuild
rename to chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r703.ebuild
index cfd2534..5927c41 100644
--- a/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r702.ebuild
+++ b/chromeos-base/hammerd-test-utils/hammerd-test-utils-0.0.1-r703.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "012c74a2d8eae81ede02bdd5d5fdcdaeafd46f34" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "012c74a2d8eae81ede02bdd5d5fdcdaeafd46f34" "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-r1164.ebuild b/chromeos-base/hammerd/hammerd-0.0.1-r1165.ebuild
similarity index 91%
rename from chromeos-base/hammerd/hammerd-0.0.1-r1164.ebuild
rename to chromeos-base/hammerd/hammerd-0.0.1-r1165.ebuild
index 3c0291f..c37a9bb 100644
--- a/chromeos-base/hammerd/hammerd-0.0.1-r1164.ebuild
+++ b/chromeos-base/hammerd/hammerd-0.0.1-r1165.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "012c74a2d8eae81ede02bdd5d5fdcdaeafd46f34" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "012c74a2d8eae81ede02bdd5d5fdcdaeafd46f34" "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-r576.ebuild b/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r577.ebuild
similarity index 92%
rename from chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r576.ebuild
rename to chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r577.ebuild
index 455f57a..0e9d1f7 100644
--- a/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r576.ebuild
+++ b/chromeos-base/hardware_verifier/hardware_verifier-0.0.1-r577.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "68361c6922909c829d679a3b5f79a5a64e977c35" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "68361c6922909c829d679a3b5f79a5a64e977c35" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r384.ebuild b/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r385.ebuild
similarity index 88%
rename from chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r384.ebuild
rename to chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r385.ebuild
index acd9a4c..4a37668 100644
--- a/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r384.ebuild
+++ b/chromeos-base/hardware_verifier_proto/hardware_verifier_proto-0.0.1-r385.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "68361c6922909c829d679a3b5f79a5a64e977c35" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "68361c6922909c829d679a3b5f79a5a64e977c35" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/hardware_verifier/..."
 )
diff --git a/chromeos-base/hiberman-client/hiberman-client-0.0.1-r97.ebuild b/chromeos-base/hiberman-client/hiberman-client-0.0.1-r98.ebuild
similarity index 87%
rename from chromeos-base/hiberman-client/hiberman-client-0.0.1-r97.ebuild
rename to chromeos-base/hiberman-client/hiberman-client-0.0.1-r98.ebuild
index 4e17651..29abf2b 100644
--- a/chromeos-base/hiberman-client/hiberman-client-0.0.1-r97.ebuild
+++ b/chromeos-base/hiberman-client/hiberman-client-0.0.1-r98.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "08bdf83cf4f403dd53e27531e66f3a1fd9a23881" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "08bdf83cf4f403dd53e27531e66f3a1fd9a23881" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/hps-tool/hps-tool-0.0.1-r350.ebuild b/chromeos-base/hps-tool/hps-tool-0.0.1-r351.ebuild
similarity index 86%
rename from chromeos-base/hps-tool/hps-tool-0.0.1-r350.ebuild
rename to chromeos-base/hps-tool/hps-tool-0.0.1-r351.ebuild
index 3184abf..50937ab 100644
--- a/chromeos-base/hps-tool/hps-tool-0.0.1-r350.ebuild
+++ b/chromeos-base/hps-tool/hps-tool-0.0.1-r351.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "ddbdbd7f7519a0d8da3e33b0eaf9c5a88dc3084e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "ddbdbd7f7519a0d8da3e33b0eaf9c5a88dc3084e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/hpsd/hpsd-0.0.1-r338.ebuild b/chromeos-base/hpsd/hpsd-0.0.1-r339.ebuild
similarity index 86%
rename from chromeos-base/hpsd/hpsd-0.0.1-r338.ebuild
rename to chromeos-base/hpsd/hpsd-0.0.1-r339.ebuild
index 58ea4c8..ee8962e 100644
--- a/chromeos-base/hpsd/hpsd-0.0.1-r338.ebuild
+++ b/chromeos-base/hpsd/hpsd-0.0.1-r339.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ddbdbd7f7519a0d8da3e33b0eaf9c5a88dc3084e" "0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ddbdbd7f7519a0d8da3e33b0eaf9c5a88dc3084e" "60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn hps common-mk metrics"
diff --git a/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r527.ebuild b/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r528.ebuild
similarity index 88%
rename from chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r527.ebuild
rename to chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r528.ebuild
index b24d24e..b5f5c9e 100644
--- a/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r527.ebuild
+++ b/chromeos-base/hwsec-test-utils/hwsec-test-utils-0.0.1-r528.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("46debaa1a374952167d5a2ca0bdf36013f053bc3" "0db6495c85c9186f120853ea040436bf4259ef96" "d3dca65ea14d72be7cfe4a01dcee20b783804e56" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("46debaa1a374952167d5a2ca0bdf36013f053bc3" "60fa47aebd6ebfb702012849bd560717fceddcd4" "d3dca65ea14d72be7cfe4a01dcee20b783804e56" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "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-r407.ebuild b/chromeos-base/iioservice/iioservice-0.0.1-r408.ebuild
similarity index 91%
rename from chromeos-base/iioservice/iioservice-0.0.1-r407.ebuild
rename to chromeos-base/iioservice/iioservice-0.0.1-r408.ebuild
index 68e040d..6564a83 100644
--- a/chromeos-base/iioservice/iioservice-0.0.1-r407.ebuild
+++ b/chromeos-base/iioservice/iioservice-0.0.1-r408.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "5e9a89d06c41edf5cf43da8acf5f26ed104887e6")
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "693bb2d63562c6eff050d04f75aab1e9251e6548")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "5e9a89d06c41edf5cf43da8acf5f26ed104887e6")
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "693bb2d63562c6eff050d04f75aab1e9251e6548")
 inherit cros-constants
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r283.ebuild b/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r284.ebuild
similarity index 87%
rename from chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r283.ebuild
rename to chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r284.ebuild
index 32551a2..47ef11d 100644
--- a/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r283.ebuild
+++ b/chromeos-base/iioservice_simpleclient/iioservice_simpleclient-0.0.1-r284.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "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-r786.ebuild b/chromeos-base/imageloader-client/imageloader-client-0.0.1-r787.ebuild
similarity index 89%
rename from chromeos-base/imageloader-client/imageloader-client-0.0.1-r786.ebuild
rename to chromeos-base/imageloader-client/imageloader-client-0.0.1-r787.ebuild
index 0426a47..0edbfe9 100644
--- a/chromeos-base/imageloader-client/imageloader-client-0.0.1-r786.ebuild
+++ b/chromeos-base/imageloader-client/imageloader-client-0.0.1-r787.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "bc5f4dc1eac5097a6d543202f4a5a5a4460f724b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "bc5f4dc1eac5097a6d543202f4a5a5a4460f724b" "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-r1746.ebuild b/chromeos-base/imageloader/imageloader-0.0.1-r1747.ebuild
similarity index 91%
rename from chromeos-base/imageloader/imageloader-0.0.1-r1746.ebuild
rename to chromeos-base/imageloader/imageloader-0.0.1-r1747.ebuild
index 88666db..d9485e6 100644
--- a/chromeos-base/imageloader/imageloader-0.0.1-r1746.ebuild
+++ b/chromeos-base/imageloader/imageloader-0.0.1-r1747.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "bc5f4dc1eac5097a6d543202f4a5a5a4460f724b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "bc5f4dc1eac5097a6d543202f4a5a5a4460f724b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r171.ebuild b/chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r172.ebuild
similarity index 93%
rename from chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r171.ebuild
rename to chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r172.ebuild
index 7f30e9c..2f93940 100644
--- a/chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r171.ebuild
+++ b/chromeos-base/intel-nnhal/intel-nnhal-0.0.1-r172.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 inherit base cros-workon platform unpacker
 
 DESCRIPTION="Intel NNAPI HAL"
diff --git a/chromeos-base/kerberos/kerberos-0.0.1-r553.ebuild b/chromeos-base/kerberos/kerberos-0.0.1-r554.ebuild
similarity index 95%
rename from chromeos-base/kerberos/kerberos-0.0.1-r553.ebuild
rename to chromeos-base/kerberos/kerberos-0.0.1-r554.ebuild
index 82fa7dd..7e5f074 100644
--- a/chromeos-base/kerberos/kerberos-0.0.1-r553.ebuild
+++ b/chromeos-base/kerberos/kerberos-0.0.1-r554.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "ac73f1a95b3439bdecc48d4cf6569e1f971592eb" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "ac73f1a95b3439bdecc48d4cf6569e1f971592eb" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r182.ebuild b/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r183.ebuild
similarity index 89%
rename from chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r182.ebuild
rename to chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r183.ebuild
index fa612c9..68f8ce0 100644
--- a/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r182.ebuild
+++ b/chromeos-base/lexmark-fax-pnh/lexmark-fax-pnh-0.0.1-r183.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "f131d8f851366e6a2f8e8fa8f3042285d021d6c6")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4c04b0ebf35112629d2f6bc7e478514dcb5805cb")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "f131d8f851366e6a2f8e8fa8f3042285d021d6c6")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4c04b0ebf35112629d2f6bc7e478514dcb5805cb")
 CROS_WORKON_LOCALNAME=("platform2" "third_party/lexmark-fax-pnh")
 CROS_WORKON_EGIT_BRANCH=("main" "master")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/lexmark-fax-pnh")
diff --git a/chromeos-base/libbrillo/libbrillo-0.0.1-r2031.ebuild b/chromeos-base/libbrillo/libbrillo-0.0.1-r2032.ebuild
similarity index 95%
rename from chromeos-base/libbrillo/libbrillo-0.0.1-r2031.ebuild
rename to chromeos-base/libbrillo/libbrillo-0.0.1-r2032.ebuild
index 6700095..fb133fa 100644
--- a/chromeos-base/libbrillo/libbrillo-0.0.1-r2031.ebuild
+++ b/chromeos-base/libbrillo/libbrillo-0.0.1-r2032.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "050f07f750a45e74a69740b46ab28a09844213a9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "050f07f750a45e74a69740b46ab28a09844213a9" "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-r418.ebuild b/chromeos-base/libchrome/libchrome-0.0.1-r419.ebuild
similarity index 97%
rename from chromeos-base/libchrome/libchrome-0.0.1-r418.ebuild
rename to chromeos-base/libchrome/libchrome-0.0.1-r419.ebuild
index e4f6338..c83e200 100644
--- a/chromeos-base/libchrome/libchrome-0.0.1-r418.ebuild
+++ b/chromeos-base/libchrome/libchrome-0.0.1-r419.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "036c6524d3b0cbd41e781612fb1be87f2b46027a")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "021b14c95e2a0a46d07c3d8a1e749be44c1e96b4")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "036c6524d3b0cbd41e781612fb1be87f2b46027a")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "021b14c95e2a0a46d07c3d8a1e749be44c1e96b4")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/platform/libchrome")
 CROS_WORKON_LOCALNAME=("platform2" "platform/libchrome")
 CROS_WORKON_EGIT_BRANCH=("main" "main")
diff --git a/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1928.ebuild b/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1929.ebuild
similarity index 89%
rename from chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1928.ebuild
rename to chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1929.ebuild
index f6aa16b..6baa775 100644
--- a/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1928.ebuild
+++ b/chromeos-base/libchromeos-ui/libchromeos-ui-0.0.1-r1929.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2361f68127fc1aaed7591baf3a4ad462108f161a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2361f68127fc1aaed7591baf3a4ad462108f161a" "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-r1693.ebuild b/chromeos-base/libcontainer/libcontainer-0.0.1-r1694.ebuild
similarity index 89%
rename from chromeos-base/libcontainer/libcontainer-0.0.1-r1693.ebuild
rename to chromeos-base/libcontainer/libcontainer-0.0.1-r1694.ebuild
index 48829d0..d1787fd 100644
--- a/chromeos-base/libcontainer/libcontainer-0.0.1-r1693.ebuild
+++ b/chromeos-base/libcontainer/libcontainer-0.0.1-r1694.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/libcrossystem/libcrossystem-0.0.1-r51.ebuild b/chromeos-base/libcrossystem/libcrossystem-0.0.1-r52.ebuild
similarity index 86%
rename from chromeos-base/libcrossystem/libcrossystem-0.0.1-r51.ebuild
rename to chromeos-base/libcrossystem/libcrossystem-0.0.1-r52.ebuild
index 1347bbd..b9b4ff9 100644
--- a/chromeos-base/libcrossystem/libcrossystem-0.0.1-r51.ebuild
+++ b/chromeos-base/libcrossystem/libcrossystem-0.0.1-r52.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "3b33fc07daf512e548300eefbd028b622bc51b44" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "3b33fc07daf512e548300eefbd028b622bc51b44" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libec/libec-0.0.1-r238.ebuild b/chromeos-base/libec/libec-0.0.1-r239.ebuild
similarity index 81%
rename from chromeos-base/libec/libec-0.0.1-r238.ebuild
rename to chromeos-base/libec/libec-0.0.1-r239.ebuild
index f228eedc..925590d 100644
--- a/chromeos-base/libec/libec-0.0.1-r238.ebuild
+++ b/chromeos-base/libec/libec-0.0.1-r239.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("3e7613ea6e002e2ed9003c451537961ee1ec8c06" "0db6495c85c9186f120853ea040436bf4259ef96" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("3e7613ea6e002e2ed9003c451537961ee1ec8c06" "60fa47aebd6ebfb702012849bd560717fceddcd4" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r312.ebuild b/chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r313.ebuild
similarity index 89%
rename from chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r312.ebuild
rename to chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r313.ebuild
index 4d930da..0439d11 100644
--- a/chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r312.ebuild
+++ b/chromeos-base/libhwsec-foundation/libhwsec-foundation-0.0.1-r313.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/libhwsec/libhwsec-0.0.1-r440.ebuild b/chromeos-base/libhwsec/libhwsec-0.0.1-r441.ebuild
similarity index 91%
rename from chromeos-base/libhwsec/libhwsec-0.0.1-r440.ebuild
rename to chromeos-base/libhwsec/libhwsec-0.0.1-r441.ebuild
index 85b0563..74f3d15 100644
--- a/chromeos-base/libhwsec/libhwsec-0.0.1-r440.ebuild
+++ b/chromeos-base/libhwsec/libhwsec-0.0.1-r441.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "b2ae20cf5a237ca246eecb61de48d18247370fd5" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "b2ae20cf5a237ca246eecb61de48d18247370fd5" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "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-r326.ebuild b/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r327.ebuild
similarity index 82%
rename from chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r326.ebuild
rename to chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r327.ebuild
index e0cb065..44cafcd 100644
--- a/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r326.ebuild
+++ b/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r327.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 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-r279.ebuild b/chromeos-base/libipp/libipp-0.0.1-r280.ebuild
similarity index 87%
rename from chromeos-base/libipp/libipp-0.0.1-r279.ebuild
rename to chromeos-base/libipp/libipp-0.0.1-r280.ebuild
index 0b63fb7..ad420c5 100644
--- a/chromeos-base/libipp/libipp-0.0.1-r279.ebuild
+++ b/chromeos-base/libipp/libipp-0.0.1-r280.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a6691fe1e00666995d1480ebcc515c990861e702" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a6691fe1e00666995d1480ebcc515c990861e702" "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-r319.ebuild b/chromeos-base/libmems/libmems-0.0.1-r320.ebuild
similarity index 86%
rename from chromeos-base/libmems/libmems-0.0.1-r319.ebuild
rename to chromeos-base/libmems/libmems-0.0.1-r320.ebuild
index 394be30..704419e 100644
--- a/chromeos-base/libmems/libmems-0.0.1-r319.ebuild
+++ b/chromeos-base/libmems/libmems-0.0.1-r320.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "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-r561.ebuild b/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r562.ebuild
similarity index 92%
rename from chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r561.ebuild
rename to chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r562.ebuild
index 225da4b..05a1dc0 100644
--- a/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r561.ebuild
+++ b/chromeos-base/libpasswordprovider/libpasswordprovider-0.0.1-r562.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "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-r567.ebuild b/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r568.ebuild
similarity index 93%
rename from chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r567.ebuild
rename to chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r568.ebuild
index 91da816..150022e 100644
--- a/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r567.ebuild
+++ b/chromeos-base/libtpmcrypto/libtpmcrypto-0.0.1-r568.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "b90d0e8f789e8cfe86794cb3f36ae69967b7dc36" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "b90d0e8f789e8cfe86794cb3f36ae69967b7dc36" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "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-r360.ebuild b/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r361.ebuild
similarity index 87%
rename from chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r360.ebuild
rename to chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r361.ebuild
index 7013c29..5d62881 100644
--- a/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r360.ebuild
+++ b/chromeos-base/libvda-gpu-tests/libvda-gpu-tests-0.0.1-r361.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "4b86eae6fc1a2faee58169d41c841c86ad9bc73c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "4b86eae6fc1a2faee58169d41c841c86ad9bc73c" "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-r367.ebuild b/chromeos-base/libvda/libvda-0.0.1-r368.ebuild
similarity index 90%
rename from chromeos-base/libvda/libvda-0.0.1-r367.ebuild
rename to chromeos-base/libvda/libvda-0.0.1-r368.ebuild
index 82db7cd..19ddc2d 100644
--- a/chromeos-base/libvda/libvda-0.0.1-r367.ebuild
+++ b/chromeos-base/libvda/libvda-0.0.1-r368.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "4b86eae6fc1a2faee58169d41c841c86ad9bc73c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "4b86eae6fc1a2faee58169d41c841c86ad9bc73c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/lorgnette/lorgnette-0.0.1-r3300.ebuild b/chromeos-base/lorgnette/lorgnette-0.0.1-r3301.ebuild
similarity index 91%
rename from chromeos-base/lorgnette/lorgnette-0.0.1-r3300.ebuild
rename to chromeos-base/lorgnette/lorgnette-0.0.1-r3301.ebuild
index e2d09e6..0c2e34a 100644
--- a/chromeos-base/lorgnette/lorgnette-0.0.1-r3300.ebuild
+++ b/chromeos-base/lorgnette/lorgnette-0.0.1-r3301.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2ebd98a342da634118dbe0c2147061dadbacd722" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2ebd98a342da634118dbe0c2147061dadbacd722" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r306.ebuild b/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r307.ebuild
similarity index 85%
rename from chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r306.ebuild
rename to chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r307.ebuild
index c221777..d12e834 100644
--- a/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r306.ebuild
+++ b/chromeos-base/lorgnette_cli/lorgnette_cli-0.0.1-r307.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2ebd98a342da634118dbe0c2147061dadbacd722" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2ebd98a342da634118dbe0c2147061dadbacd722" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/lvmd-client/lvmd-client-0.0.1-r10.ebuild b/chromeos-base/lvmd-client/lvmd-client-0.0.1-r11.ebuild
similarity index 87%
rename from chromeos-base/lvmd-client/lvmd-client-0.0.1-r10.ebuild
rename to chromeos-base/lvmd-client/lvmd-client-0.0.1-r11.ebuild
index de9b17b..12b91f6 100644
--- a/chromeos-base/lvmd-client/lvmd-client-0.0.1-r10.ebuild
+++ b/chromeos-base/lvmd-client/lvmd-client-0.0.1-r11.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "9e73e8a72352b1b1983427c5dcadad86102dae9f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "9e73e8a72352b1b1983427c5dcadad86102dae9f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/lvmd/lvmd-0.0.1-r11.ebuild b/chromeos-base/lvmd/lvmd-0.0.1-r12.ebuild
similarity index 88%
rename from chromeos-base/lvmd/lvmd-0.0.1-r11.ebuild
rename to chromeos-base/lvmd/lvmd-0.0.1-r12.ebuild
index df43430..025b6f09 100644
--- a/chromeos-base/lvmd/lvmd-0.0.1-r11.ebuild
+++ b/chromeos-base/lvmd/lvmd-0.0.1-r12.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "9e73e8a72352b1b1983427c5dcadad86102dae9f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "9e73e8a72352b1b1983427c5dcadad86102dae9f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/manatee-client/manatee-client-0.0.1-r277.ebuild b/chromeos-base/manatee-client/manatee-client-0.0.1-r278.ebuild
similarity index 85%
rename from chromeos-base/manatee-client/manatee-client-0.0.1-r277.ebuild
rename to chromeos-base/manatee-client/manatee-client-0.0.1-r278.ebuild
index 81ebdd1..3dd5e16 100644
--- a/chromeos-base/manatee-client/manatee-client-0.0.1-r277.ebuild
+++ b/chromeos-base/manatee-client/manatee-client-0.0.1-r278.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "9c2074e601aedb8358ee3b7c367c62042409c577" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "9c2074e601aedb8358ee3b7c367c62042409c577" "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-r431.ebuild b/chromeos-base/mcastd/mcastd-0.0.1-r432.ebuild
similarity index 86%
rename from chromeos-base/mcastd/mcastd-0.0.1-r431.ebuild
rename to chromeos-base/mcastd/mcastd-0.0.1-r432.ebuild
index f6b9d0f..7223bb0 100644
--- a/chromeos-base/mcastd/mcastd-0.0.1-r431.ebuild
+++ b/chromeos-base/mcastd/mcastd-0.0.1-r432.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "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-r220.ebuild b/chromeos-base/memd/memd-0.1.0-r221.ebuild
similarity index 89%
rename from chromeos-base/memd/memd-0.1.0-r220.ebuild
rename to chromeos-base/memd/memd-0.1.0-r221.ebuild
index 5b5939a..8ecbf7c 100644
--- a/chromeos-base/memd/memd-0.1.0-r220.ebuild
+++ b/chromeos-base/memd/memd-0.1.0-r221.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("01b50a59e273ec24dbcb97c99f0613495bec8cd2" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("01b50a59e273ec24dbcb97c99f0613495bec8cd2" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_RUST_SUBDIR="metrics/memd"
 
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/mems_setup/mems_setup-0.0.1-r542.ebuild b/chromeos-base/mems_setup/mems_setup-0.0.1-r543.ebuild
similarity index 92%
rename from chromeos-base/mems_setup/mems_setup-0.0.1-r542.ebuild
rename to chromeos-base/mems_setup/mems_setup-0.0.1-r543.ebuild
index a6d622c..3ade11b 100644
--- a/chromeos-base/mems_setup/mems_setup-0.0.1-r542.ebuild
+++ b/chromeos-base/mems_setup/mems_setup-0.0.1-r543.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "59907d1e2a26ebb55ffe31e1bb4154906a2a8b80" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "59907d1e2a26ebb55ffe31e1bb4154906a2a8b80" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "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-r3467.ebuild b/chromeos-base/metrics/metrics-0.0.1-r3468.ebuild
similarity index 96%
rename from chromeos-base/metrics/metrics-0.0.1-r3467.ebuild
rename to chromeos-base/metrics/metrics-0.0.1-r3468.ebuild
index 81e7313..fa43c5b 100644
--- a/chromeos-base/metrics/metrics-0.0.1-r3467.ebuild
+++ b/chromeos-base/metrics/metrics-0.0.1-r3468.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r1289.ebuild b/chromeos-base/midis/midis-0.0.1-r1290.ebuild
similarity index 90%
rename from chromeos-base/midis/midis-0.0.1-r1289.ebuild
rename to chromeos-base/midis/midis-0.0.1-r1290.ebuild
index fa18f50..a82f4e9 100644
--- a/chromeos-base/midis/midis-0.0.1-r1289.ebuild
+++ b/chromeos-base/midis/midis-0.0.1-r1290.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "77cc36d72b2a07ce056c6dc57290b2e094db7931")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "31231d9b91954e1332b0c70e98f518eed9f27186" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4baf7cba90f916c94dd07c5746355f65e2ee0d8e")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "77cc36d72b2a07ce056c6dc57290b2e094db7931")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "31231d9b91954e1332b0c70e98f518eed9f27186" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4baf7cba90f916c94dd07c5746355f65e2ee0d8e")
 CROS_WORKON_LOCALNAME=(
 	"platform2"
 	"chromium/src/media/midi"
diff --git a/chromeos-base/minios/minios-0.0.1-r294.ebuild b/chromeos-base/minios/minios-0.0.1-r295.ebuild
similarity index 93%
rename from chromeos-base/minios/minios-0.0.1-r294.ebuild
rename to chromeos-base/minios/minios-0.0.1-r295.ebuild
index 1c7c65a..8778d53 100644
--- a/chromeos-base/minios/minios-0.0.1-r294.ebuild
+++ b/chromeos-base/minios/minios-0.0.1-r295.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "267f4c31778cc992ff3cbbff6a8147c24cad8a2c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "267f4c31778cc992ff3cbbff6a8147c24cad8a2c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/missive/missive-0.0.1-r299.ebuild b/chromeos-base/missive/missive-0.0.1-r300.ebuild
similarity index 95%
rename from chromeos-base/missive/missive-0.0.1-r299.ebuild
rename to chromeos-base/missive/missive-0.0.1-r300.ebuild
index 5d5ce3b..c99c7b6 100644
--- a/chromeos-base/missive/missive-0.0.1-r299.ebuild
+++ b/chromeos-base/missive/missive-0.0.1-r300.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "193c9f869b11ef9acebdda75fc70f0f0e79c54ee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "193c9f869b11ef9acebdda75fc70f0f0e79c54ee" "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-r3303.ebuild b/chromeos-base/mist/mist-0.0.1-r3304.ebuild
similarity index 89%
rename from chromeos-base/mist/mist-0.0.1-r3303.ebuild
rename to chromeos-base/mist/mist-0.0.1-r3304.ebuild
index a8ea199..f6a2ca0 100644
--- a/chromeos-base/mist/mist-0.0.1-r3303.ebuild
+++ b/chromeos-base/mist/mist-0.0.1-r3304.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "4ec2fa4d5c39ef8f7ff31b3d41e38249461e55f7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "4ec2fa4d5c39ef8f7ff31b3d41e38249461e55f7" "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-r218.ebuild b/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r219.ebuild
similarity index 86%
rename from chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r218.ebuild
rename to chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r219.ebuild
index cd86498..cfa09f2 100644
--- a/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r218.ebuild
+++ b/chromeos-base/ml-benchmark/ml-benchmark-0.0.1-r219.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/ml-client/ml-client-0.0.1-r200.ebuild b/chromeos-base/ml-client/ml-client-0.0.1-r201.ebuild
similarity index 85%
rename from chromeos-base/ml-client/ml-client-0.0.1-r200.ebuild
rename to chromeos-base/ml-client/ml-client-0.0.1-r201.ebuild
index b91fa08..abfa4ce 100644
--- a/chromeos-base/ml-client/ml-client-0.0.1-r200.ebuild
+++ b/chromeos-base/ml-client/ml-client-0.0.1-r201.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "efb8748309392ad76f174d36f109b9866bcf8241" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "efb8748309392ad76f174d36f109b9866bcf8241" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r444.ebuild b/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r445.ebuild
similarity index 87%
rename from chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r444.ebuild
rename to chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r445.ebuild
index 0c853a7..957b861 100644
--- a/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r444.ebuild
+++ b/chromeos-base/ml-cmdline/ml-cmdline-0.0.1-r445.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "efb8748309392ad76f174d36f109b9866bcf8241" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "efb8748309392ad76f174d36f109b9866bcf8241" "363badc7f07136727d95cdd25b229e9282328f00" "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-r764.ebuild b/chromeos-base/ml/ml-0.0.1-r765.ebuild
similarity index 97%
rename from chromeos-base/ml/ml-0.0.1-r764.ebuild
rename to chromeos-base/ml/ml-0.0.1-r765.ebuild
index 128138f..49119a2 100644
--- a/chromeos-base/ml/ml-0.0.1-r764.ebuild
+++ b/chromeos-base/ml/ml-0.0.1-r765.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "efb8748309392ad76f174d36f109b9866bcf8241" "363badc7f07136727d95cdd25b229e9282328f00" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "efb8748309392ad76f174d36f109b9866bcf8241" "363badc7f07136727d95cdd25b229e9282328f00" "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/modem-utilities/modem-utilities-0.0.1-r2938.ebuild b/chromeos-base/modem-utilities/modem-utilities-0.0.1-r2939.ebuild
similarity index 86%
rename from chromeos-base/modem-utilities/modem-utilities-0.0.1-r2938.ebuild
rename to chromeos-base/modem-utilities/modem-utilities-0.0.1-r2939.ebuild
index eeb3425..a46bbd5 100644
--- a/chromeos-base/modem-utilities/modem-utilities-0.0.1-r2938.ebuild
+++ b/chromeos-base/modem-utilities/modem-utilities-0.0.1-r2939.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e2b936a0514f5beabb11c1b2b5bbe45470430604" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e2b936a0514f5beabb11c1b2b5bbe45470430604" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"
diff --git a/chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r149.ebuild b/chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r150.ebuild
similarity index 87%
rename from chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r149.ebuild
rename to chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r150.ebuild
index 3eb9da6..73867a4 100644
--- a/chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r149.ebuild
+++ b/chromeos-base/modemfwd-proto/modemfwd-proto-0.0.1-r150.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/modemfwd/..."
 )
diff --git a/chromeos-base/modemfwd/modemfwd-0.0.1-r1122.ebuild b/chromeos-base/modemfwd/modemfwd-0.0.1-r1123.ebuild
similarity index 91%
rename from chromeos-base/modemfwd/modemfwd-0.0.1-r1122.ebuild
rename to chromeos-base/modemfwd/modemfwd-0.0.1-r1123.ebuild
index 5ffb0a3..714577c 100644
--- a/chromeos-base/modemfwd/modemfwd-0.0.1-r1122.ebuild
+++ b/chromeos-base/modemfwd/modemfwd-0.0.1-r1123.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r82.ebuild b/chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r83.ebuild
similarity index 87%
rename from chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r82.ebuild
rename to chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r83.ebuild
index 3b1d6a9..d98ae37 100644
--- a/chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r82.ebuild
+++ b/chromeos-base/mojo_service_manager/mojo_service_manager-0.0.1-r83.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e5479e7b2bbc0ce8164e799c7f1bc50ec3216a48" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e5479e7b2bbc0ce8164e799c7f1bc50ec3216a48" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r596.ebuild b/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r597.ebuild
similarity index 86%
rename from chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r596.ebuild
rename to chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r597.ebuild
index dd66d98..264f65c 100644
--- a/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r596.ebuild
+++ b/chromeos-base/mount-passthrough/mount-passthrough-0.0.2-r597.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f783dc02e17f522e5e62cbc3a6f56aa96082b0c2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f783dc02e17f522e5e62cbc3a6f56aa96082b0c2" "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-r423.ebuild b/chromeos-base/mri_package/mri_package-0.0.1-r424.ebuild
similarity index 91%
rename from chromeos-base/mri_package/mri_package-0.0.1-r423.ebuild
rename to chromeos-base/mri_package/mri_package-0.0.1-r424.ebuild
index d47f19d..bc32583 100644
--- a/chromeos-base/mri_package/mri_package-0.0.1-r423.ebuild
+++ b/chromeos-base/mri_package/mri_package-0.0.1-r424.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "55e711ea347453c157ecfbeaa434f6236e83a8f6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "55e711ea347453c157ecfbeaa434f6236e83a8f6" "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-r1057.ebuild b/chromeos-base/mtpd/mtpd-0.0.1-r1058.ebuild
similarity index 91%
rename from chromeos-base/mtpd/mtpd-0.0.1-r1057.ebuild
rename to chromeos-base/mtpd/mtpd-0.0.1-r1058.ebuild
index b3e6f59..42ee516 100644
--- a/chromeos-base/mtpd/mtpd-0.0.1-r1057.ebuild
+++ b/chromeos-base/mtpd/mtpd-0.0.1-r1058.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "19fd4b7d746a3e6652d8d74ce0ca72cba5b79156" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "19fd4b7d746a3e6652d8d74ce0ca72cba5b79156" "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-r431.ebuild b/chromeos-base/ndproxyd/ndproxyd-0.0.1-r432.ebuild
similarity index 86%
rename from chromeos-base/ndproxyd/ndproxyd-0.0.1-r431.ebuild
rename to chromeos-base/ndproxyd/ndproxyd-0.0.1-r432.ebuild
index 8834ad4..14dffa8 100644
--- a/chromeos-base/ndproxyd/ndproxyd-0.0.1-r431.ebuild
+++ b/chromeos-base/ndproxyd/ndproxyd-0.0.1-r432.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/ocr/ocr-0.0.1-r185.ebuild b/chromeos-base/ocr/ocr-0.0.1-r186.ebuild
similarity index 92%
rename from chromeos-base/ocr/ocr-0.0.1-r185.ebuild
rename to chromeos-base/ocr/ocr-0.0.1-r186.ebuild
index 7e12b53..91bd3cb 100644
--- a/chromeos-base/ocr/ocr-0.0.1-r185.ebuild
+++ b/chromeos-base/ocr/ocr-0.0.1-r186.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "71ac4fba03d3ae469f2a9b2474be4fe0eee115f4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "71ac4fba03d3ae469f2a9b2474be4fe0eee115f4" "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-r675.ebuild b/chromeos-base/oobe_config/oobe_config-0.0.1-r676.ebuild
similarity index 94%
rename from chromeos-base/oobe_config/oobe_config-0.0.1-r675.ebuild
rename to chromeos-base/oobe_config/oobe_config-0.0.1-r676.ebuild
index 82958f0..e2cf29e 100644
--- a/chromeos-base/oobe_config/oobe_config-0.0.1-r675.ebuild
+++ b/chromeos-base/oobe_config/oobe_config-0.0.1-r676.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "23e26d72db170ceb92e4d3682dbad1c73030acfa" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "23e26d72db170ceb92e4d3682dbad1c73030acfa" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "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-r3518.ebuild b/chromeos-base/p2p/p2p-0.0.1-r3519.ebuild
similarity index 92%
rename from chromeos-base/p2p/p2p-0.0.1-r3518.ebuild
rename to chromeos-base/p2p/p2p-0.0.1-r3519.ebuild
index 691e8d6..33fd4e1 100644
--- a/chromeos-base/p2p/p2p-0.0.1-r3518.ebuild
+++ b/chromeos-base/p2p/p2p-0.0.1-r3519.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "d8f47448cc0c72d3398c8e958cf3ce08eba6f1d5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "d8f47448cc0c72d3398c8e958cf3ce08eba6f1d5" "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-r347.ebuild b/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r348.ebuild
similarity index 93%
rename from chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r347.ebuild
rename to chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r348.ebuild
index 3c2b04a..e640507 100644
--- a/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r347.ebuild
+++ b/chromeos-base/patchpanel-client/patchpanel-client-0.0.1-r348.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "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-r563.ebuild b/chromeos-base/patchpanel/patchpanel-0.0.2-r564.ebuild
similarity index 95%
rename from chromeos-base/patchpanel/patchpanel-0.0.2-r563.ebuild
rename to chromeos-base/patchpanel/patchpanel-0.0.2-r564.ebuild
index cbdeb62..5b5312b 100644
--- a/chromeos-base/patchpanel/patchpanel-0.0.2-r563.ebuild
+++ b/chromeos-base/patchpanel/patchpanel-0.0.2-r564.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "bf11ffe5bade82cef5574e57f94fd0e7e38b716c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "f03ea3ffcf6f08a1cad9dffba29095b0b988ec0d" "bf11ffe5bade82cef5574e57f94fd0e7e38b716c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/pciguard/pciguard-0.0.1-r170.ebuild b/chromeos-base/pciguard/pciguard-0.0.1-r171.ebuild
similarity index 90%
rename from chromeos-base/pciguard/pciguard-0.0.1-r170.ebuild
rename to chromeos-base/pciguard/pciguard-0.0.1-r171.ebuild
index a05e793..3ea0f85 100644
--- a/chromeos-base/pciguard/pciguard-0.0.1-r170.ebuild
+++ b/chromeos-base/pciguard/pciguard-0.0.1-r171.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "ab158a900aa41e259ccbdbc58b75bfc3ae136f3b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "ab158a900aa41e259ccbdbc58b75bfc3ae136f3b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r137.ebuild b/chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r138.ebuild
similarity index 86%
rename from chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r137.ebuild
rename to chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r138.ebuild
index 698f397..2bd2e6e 100644
--- a/chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r137.ebuild
+++ b/chromeos-base/perfetto_simple_producer/perfetto_simple_producer-0.0.1-r138.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "1288ac713c854ca0f3e6c2cd1c77e98a5a194e74" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "1288ac713c854ca0f3e6c2cd1c77e98a5a194e74" "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-r2025.ebuild b/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2026.ebuild
similarity index 89%
rename from chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2025.ebuild
rename to chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2026.ebuild
index 39d9dc4..a6b6bfa 100644
--- a/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2025.ebuild
+++ b/chromeos-base/permission_broker-client/permission_broker-client-0.0.1-r2026.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "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-r3279.ebuild b/chromeos-base/permission_broker/permission_broker-0.0.1-r3280.ebuild
similarity index 92%
rename from chromeos-base/permission_broker/permission_broker-0.0.1-r3279.ebuild
rename to chromeos-base/permission_broker/permission_broker-0.0.1-r3280.ebuild
index 81e32ce..c08810d 100644
--- a/chromeos-base/permission_broker/permission_broker-0.0.1-r3279.ebuild
+++ b/chromeos-base/permission_broker/permission_broker-0.0.1-r3280.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/pinweaver/pinweaver-0.0.1-r88.ebuild b/chromeos-base/pinweaver/pinweaver-0.0.1-r89.ebuild
similarity index 90%
rename from chromeos-base/pinweaver/pinweaver-0.0.1-r88.ebuild
rename to chromeos-base/pinweaver/pinweaver-0.0.1-r89.ebuild
index 1228633..68d0c23 100644
--- a/chromeos-base/pinweaver/pinweaver-0.0.1-r88.ebuild
+++ b/chromeos-base/pinweaver/pinweaver-0.0.1-r89.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "3abfd77090d24ca8d2d7260d6ba6aaec2e4c35ae")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "86f25a69ccb900fd0f5da1a8861df68696c36330")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "3abfd77090d24ca8d2d7260d6ba6aaec2e4c35ae")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "86f25a69ccb900fd0f5da1a8861df68696c36330")
 inherit cros-constants
 
 CROS_WORKON_LOCALNAME=(
diff --git a/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r326.ebuild b/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r327.ebuild
similarity index 87%
rename from chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r326.ebuild
rename to chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r327.ebuild
index 20102f6..f21a6a6 100644
--- a/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r326.ebuild
+++ b/chromeos-base/policy-go-proto/policy-go-proto-0.0.1-r327.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f6e985347a838bbbdd2997e97c4b4940571f2dd2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f6e985347a838bbbdd2997e97c4b4940571f2dd2" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/policy/..."
 )
diff --git a/chromeos-base/policy_utils/policy_utils-0.0.1-r329.ebuild b/chromeos-base/policy_utils/policy_utils-0.0.1-r330.ebuild
similarity index 88%
rename from chromeos-base/policy_utils/policy_utils-0.0.1-r329.ebuild
rename to chromeos-base/policy_utils/policy_utils-0.0.1-r330.ebuild
index c03720d..21324fd 100644
--- a/chromeos-base/policy_utils/policy_utils-0.0.1-r329.ebuild
+++ b/chromeos-base/policy_utils/policy_utils-0.0.1-r330.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "8fbdaea8ad40677acc8a26ad43f036ed7ece2ec8" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "8fbdaea8ad40677acc8a26ad43f036ed7ece2ec8" "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-r2418.ebuild b/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2419.ebuild
similarity index 87%
rename from chromeos-base/power_manager-client/power_manager-client-0.0.1-r2418.ebuild
rename to chromeos-base/power_manager-client/power_manager-client-0.0.1-r2419.ebuild
index 0709e52..e3e062a 100644
--- a/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2418.ebuild
+++ b/chromeos-base/power_manager-client/power_manager-client-0.0.1-r2419.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "0bb1188da737e1a0399457e852e32dc8cfba2567" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "0bb1188da737e1a0399457e852e32dc8cfba2567" "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-r4327.ebuild b/chromeos-base/power_manager/power_manager-0.0.2-r4328.ebuild
similarity index 97%
rename from chromeos-base/power_manager/power_manager-0.0.2-r4327.ebuild
rename to chromeos-base/power_manager/power_manager-0.0.2-r4328.ebuild
index d8967e3..4bdaafe 100644
--- a/chromeos-base/power_manager/power_manager-0.0.2-r4327.ebuild
+++ b/chromeos-base/power_manager/power_manager-0.0.2-r4328.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0bb1188da737e1a0399457e852e32dc8cfba2567" "62f84a7b4216d539df553a5bafe00d85969a9f63" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "a97bd01dbd0e88c337336d29105ee63b03a4ef9f" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0bb1188da737e1a0399457e852e32dc8cfba2567" "62f84a7b4216d539df553a5bafe00d85969a9f63" "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-r259.ebuild b/chromeos-base/print_tools/print_tools-0.0.1-r260.ebuild
similarity index 86%
rename from chromeos-base/print_tools/print_tools-0.0.1-r259.ebuild
rename to chromeos-base/print_tools/print_tools-0.0.1-r260.ebuild
index 7680b8c..38cd8cd 100644
--- a/chromeos-base/print_tools/print_tools-0.0.1-r259.ebuild
+++ b/chromeos-base/print_tools/print_tools-0.0.1-r260.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "13183fe914ad9f617d493ad25fe9b7db7b0078ab" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "13183fe914ad9f617d493ad25fe9b7db7b0078ab" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r15.ebuild b/chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r16.ebuild
similarity index 86%
rename from chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r15.ebuild
rename to chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r16.ebuild
index 109bf85..b312de5 100644
--- a/chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r15.ebuild
+++ b/chromeos-base/qc-modemfwd-helper/qc-modemfwd-helper-0.0.1-r16.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f9d7642be5b503d284cb5ac683ec681e06938c01" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f9d7642be5b503d284cb5ac683ec681e06938c01" "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-r2792.ebuild b/chromeos-base/quipper/quipper-0.0.1-r2793.ebuild
similarity index 93%
rename from chromeos-base/quipper/quipper-0.0.1-r2792.ebuild
rename to chromeos-base/quipper/quipper-0.0.1-r2793.ebuild
index 9861e6c..62055cc 100644
--- a/chromeos-base/quipper/quipper-0.0.1-r2792.ebuild
+++ b/chromeos-base/quipper/quipper-0.0.1-r2793.ebuild
@@ -4,8 +4,8 @@
 # Don't use Makefile.external here as it fetches from the network.
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/rendernodehost/rendernodehost-0.0.1-r299.ebuild b/chromeos-base/rendernodehost/rendernodehost-0.0.1-r300.ebuild
similarity index 85%
rename from chromeos-base/rendernodehost/rendernodehost-0.0.1-r299.ebuild
rename to chromeos-base/rendernodehost/rendernodehost-0.0.1-r300.ebuild
index e0b04cd..7755637 100644
--- a/chromeos-base/rendernodehost/rendernodehost-0.0.1-r299.ebuild
+++ b/chromeos-base/rendernodehost/rendernodehost-0.0.1-r300.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/rgbkbd/rgbkbd-0.0.1-r126.ebuild b/chromeos-base/rgbkbd/rgbkbd-0.0.1-r127.ebuild
similarity index 91%
rename from chromeos-base/rgbkbd/rgbkbd-0.0.1-r126.ebuild
rename to chromeos-base/rgbkbd/rgbkbd-0.0.1-r127.ebuild
index 7c37000..7eedb1a 100644
--- a/chromeos-base/rgbkbd/rgbkbd-0.0.1-r126.ebuild
+++ b/chromeos-base/rgbkbd/rgbkbd-0.0.1-r127.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "58bdeaa3004ba5dc3bf524c1d0a3d444f4984d28" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "58bdeaa3004ba5dc3bf524c1d0a3d444f4984d28" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/rmad/rmad-0.0.1-r491.ebuild b/chromeos-base/rmad/rmad-0.0.1-r492.ebuild
similarity index 92%
rename from chromeos-base/rmad/rmad-0.0.1-r491.ebuild
rename to chromeos-base/rmad/rmad-0.0.1-r492.ebuild
index 9cf6e5d..81f0711 100644
--- a/chromeos-base/rmad/rmad-0.0.1-r491.ebuild
+++ b/chromeos-base/rmad/rmad-0.0.1-r492.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "68361c6922909c829d679a3b5f79a5a64e977c35" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "bdcd86d7f8af0e0cfd82183af63cd1006e593a1a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "68361c6922909c829d679a3b5f79a5a64e977c35" "4d8f590bd987ed599a906fe078fb08b51c7c7f9c" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "bdcd86d7f8af0e0cfd82183af63cd1006e593a1a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/run_oci/run_oci-0.0.1-r1242.ebuild b/chromeos-base/run_oci/run_oci-0.0.1-r1243.ebuild
similarity index 89%
rename from chromeos-base/run_oci/run_oci-0.0.1-r1242.ebuild
rename to chromeos-base/run_oci/run_oci-0.0.1-r1243.ebuild
index ccc1ecf..311dab2 100644
--- a/chromeos-base/run_oci/run_oci-0.0.1-r1242.ebuild
+++ b/chromeos-base/run_oci/run_oci-0.0.1-r1243.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "a6cf87161b285bcef270a8d37f2240ab6eb2952e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "dbb4c5a189c098e0c692a1dee66f5a6b6ef33a32" "a6cf87161b285bcef270a8d37f2240ab6eb2952e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r19.ebuild b/chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r20.ebuild
similarity index 87%
rename from chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r19.ebuild
rename to chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r20.ebuild
index 93b18f46..0cbb2ac 100644
--- a/chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r19.ebuild
+++ b/chromeos-base/runtime_probe-client/runtime_probe-client-0.0.1-r20.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/runtime_probe/runtime_probe-0.0.1-r866.ebuild b/chromeos-base/runtime_probe/runtime_probe-0.0.1-r867.ebuild
similarity index 92%
rename from chromeos-base/runtime_probe/runtime_probe-0.0.1-r866.ebuild
rename to chromeos-base/runtime_probe/runtime_probe-0.0.1-r867.ebuild
index 41d74fa..4b82873 100644
--- a/chromeos-base/runtime_probe/runtime_probe-0.0.1-r866.ebuild
+++ b/chromeos-base/runtime_probe/runtime_probe-0.0.1-r867.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "1dbf281b6523338c1a11135ebaf00796f0f664e4" "7cab0a8a8eaf018de16dca9470abb154f82697a6" "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-r253.ebuild b/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r254.ebuild
similarity index 90%
rename from chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r253.ebuild
rename to chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r254.ebuild
index cb24134..502c205 100644
--- a/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r253.ebuild
+++ b/chromeos-base/screen-capture-utils/screen-capture-utils-0.0.1-r254.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "b996d22037bb49a510f4dbf3139a179f8727ed59" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "b996d22037bb49a510f4dbf3139a179f8727ed59" "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-r590.ebuild b/chromeos-base/sealed_storage/sealed_storage-0.0.1-r591.ebuild
similarity index 89%
rename from chromeos-base/sealed_storage/sealed_storage-0.0.1-r590.ebuild
rename to chromeos-base/sealed_storage/sealed_storage-0.0.1-r591.ebuild
index 80c5ed6e..738535d 100644
--- a/chromeos-base/sealed_storage/sealed_storage-0.0.1-r590.ebuild
+++ b/chromeos-base/sealed_storage/sealed_storage-0.0.1-r591.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "ebd80d3e9a0d5136bc9154864fc7c23cea4a5861" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "ebd80d3e9a0d5136bc9154864fc7c23cea4a5861" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/secanomalyd/secanomalyd-0.0.1-r261.ebuild b/chromeos-base/secanomalyd/secanomalyd-0.0.1-r262.ebuild
similarity index 90%
rename from chromeos-base/secanomalyd/secanomalyd-0.0.1-r261.ebuild
rename to chromeos-base/secanomalyd/secanomalyd-0.0.1-r262.ebuild
index 4d1df52..5181f70 100644
--- a/chromeos-base/secanomalyd/secanomalyd-0.0.1-r261.ebuild
+++ b/chromeos-base/secanomalyd/secanomalyd-0.0.1-r262.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "49734b00bc3c6d6877429cc25d1d504275e3a151" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "49734b00bc3c6d6877429cc25d1d504275e3a151" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1044.ebuild b/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1045.ebuild
similarity index 84%
rename from chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1044.ebuild
rename to chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1045.ebuild
index 0a13cab..970d5ef 100644
--- a/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1044.ebuild
+++ b/chromeos-base/secure-erase-file/secure-erase-file-0.0.1-r1045.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "1454f5ebf6a159645127c22d8c4e382e8752569d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "1454f5ebf6a159645127c22d8c4e382e8752569d" "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-r263.ebuild b/chromeos-base/secure-wipe/secure-wipe-0.0.1-r264.ebuild
similarity index 87%
rename from chromeos-base/secure-wipe/secure-wipe-0.0.1-r263.ebuild
rename to chromeos-base/secure-wipe/secure-wipe-0.0.1-r264.ebuild
index 3a2831f..62b05bd 100644
--- a/chromeos-base/secure-wipe/secure-wipe-0.0.1-r263.ebuild
+++ b/chromeos-base/secure-wipe/secure-wipe-0.0.1-r264.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "898687cfd878621b0aa42a27138c8a6c72210b16" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "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-r2357.ebuild b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2358.ebuild
similarity index 89%
rename from chromeos-base/session_manager-client/session_manager-client-0.0.1-r2357.ebuild
rename to chromeos-base/session_manager-client/session_manager-client-0.0.1-r2358.ebuild
index a5924b5f..60431b4 100644
--- a/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2357.ebuild
+++ b/chromeos-base/session_manager-client/session_manager-client-0.0.1-r2358.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "86c7faad3e91503ff0fd5d28ede2e13016668322" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "86c7faad3e91503ff0fd5d28ede2e13016668322" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/shill-client/shill-client-0.0.1-r3202.ebuild b/chromeos-base/shill-client/shill-client-0.0.1-r3203.ebuild
similarity index 87%
rename from chromeos-base/shill-client/shill-client-0.0.1-r3202.ebuild
rename to chromeos-base/shill-client/shill-client-0.0.1-r3203.ebuild
index 4f90c45..c8b3672 100644
--- a/chromeos-base/shill-client/shill-client-0.0.1-r3202.ebuild
+++ b/chromeos-base/shill-client/shill-client-0.0.1-r3203.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "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-r974.ebuild b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r975.ebuild
similarity index 90%
rename from chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r974.ebuild
rename to chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r975.ebuild
index 9adfed4..a254562 100644
--- a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r974.ebuild
+++ b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r975.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "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-r1050.ebuild b/chromeos-base/shill-net/shill-net-0.0.1-r1051.ebuild
similarity index 93%
rename from chromeos-base/shill-net/shill-net-0.0.1-r1050.ebuild
rename to chromeos-base/shill-net/shill-net-0.0.1-r1051.ebuild
index 70282ed..4a87274 100644
--- a/chromeos-base/shill-net/shill-net-0.0.1-r1050.ebuild
+++ b/chromeos-base/shill-net/shill-net-0.0.1-r1051.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "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-r3424.ebuild b/chromeos-base/shill/shill-0.0.5-r3425.ebuild
similarity index 97%
rename from chromeos-base/shill/shill-0.0.5-r3424.ebuild
rename to chromeos-base/shill/shill-0.0.5-r3425.ebuild
index cdf6271..451db5c 100644
--- a/chromeos-base/shill/shill-0.0.5-r3424.ebuild
+++ b/chromeos-base/shill/shill-0.0.5-r3425.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "462cb7ad367bdc196dd234e5bae863472f6d704b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e72f56ad37eadb01ad2b42e9938beb23cb3a389" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "a01f3347417f5998d84a0daaee9e7eefb7ad1205" "462cb7ad367bdc196dd234e5bae863472f6d704b" "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-r345.ebuild b/chromeos-base/smbfs/smbfs-0.0.1-r346.ebuild
similarity index 92%
rename from chromeos-base/smbfs/smbfs-0.0.1-r345.ebuild
rename to chromeos-base/smbfs/smbfs-0.0.1-r346.ebuild
index 4818d54..9580eaa 100644
--- a/chromeos-base/smbfs/smbfs-0.0.1-r345.ebuild
+++ b/chromeos-base/smbfs/smbfs-0.0.1-r346.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "081f3cb6a8b89d84bcb58dd2f4af48252bc9af8b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "081f3cb6a8b89d84bcb58dd2f4af48252bc9af8b" "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-r849.ebuild b/chromeos-base/smbprovider/smbprovider-0.0.1-r850.ebuild
similarity index 92%
rename from chromeos-base/smbprovider/smbprovider-0.0.1-r849.ebuild
rename to chromeos-base/smbprovider/smbprovider-0.0.1-r850.ebuild
index dc7b707..94ead19 100644
--- a/chromeos-base/smbprovider/smbprovider-0.0.1-r849.ebuild
+++ b/chromeos-base/smbprovider/smbprovider-0.0.1-r850.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "2e66ddb9236626115d901c320e96774023921bb0" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "2e66ddb9236626115d901c320e96774023921bb0" "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-r3179.ebuild b/chromeos-base/smogcheck/smogcheck-0.0.1-r3180.ebuild
similarity index 86%
rename from chromeos-base/smogcheck/smogcheck-0.0.1-r3179.ebuild
rename to chromeos-base/smogcheck/smogcheck-0.0.1-r3180.ebuild
index 1ee0ae4..12abb8a 100644
--- a/chromeos-base/smogcheck/smogcheck-0.0.1-r3179.ebuild
+++ b/chromeos-base/smogcheck/smogcheck-0.0.1-r3180.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "25b90cd13b01122d778a1d55d814c5b001b88d22" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "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-r315.ebuild b/chromeos-base/sommelier/sommelier-0.0.1-r316.ebuild
similarity index 94%
rename from chromeos-base/sommelier/sommelier-0.0.1-r315.ebuild
rename to chromeos-base/sommelier/sommelier-0.0.1-r316.ebuild
index bf1d3bd..1d1b260 100644
--- a/chromeos-base/sommelier/sommelier-0.0.1-r315.ebuild
+++ b/chromeos-base/sommelier/sommelier-0.0.1-r316.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f81fd2f617fbb538b0e48736020d89814f047321" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f81fd2f617fbb538b0e48736020d89814f047321" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/spaced/spaced-0.0.1-r134.ebuild b/chromeos-base/spaced/spaced-0.0.1-r135.ebuild
similarity index 90%
rename from chromeos-base/spaced/spaced-0.0.1-r134.ebuild
rename to chromeos-base/spaced/spaced-0.0.1-r135.ebuild
index 3a8eb51..345162a 100644
--- a/chromeos-base/spaced/spaced-0.0.1-r134.ebuild
+++ b/chromeos-base/spaced/spaced-0.0.1-r135.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "350cc434223a8fc7e7852f0b810bac3e4cb660ce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "350cc434223a8fc7e7852f0b810bac3e4cb660ce" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/st_flash/st_flash-0.0.1-r1370.ebuild b/chromeos-base/st_flash/st_flash-0.0.1-r1371.ebuild
similarity index 83%
rename from chromeos-base/st_flash/st_flash-0.0.1-r1370.ebuild
rename to chromeos-base/st_flash/st_flash-0.0.1-r1371.ebuild
index ab4d30d..bfbe003 100644
--- a/chromeos-base/st_flash/st_flash-0.0.1-r1370.ebuild
+++ b/chromeos-base/st_flash/st_flash-0.0.1-r1371.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "0f74874dbc6607278e98259190322851828be09a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "0f74874dbc6607278e98259190322851828be09a" "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-r165.ebuild b/chromeos-base/syslog-cat/syslog-cat-0.0.1-r166.ebuild
similarity index 85%
rename from chromeos-base/syslog-cat/syslog-cat-0.0.1-r165.ebuild
rename to chromeos-base/syslog-cat/syslog-cat-0.0.1-r166.ebuild
index 1b9203e..8fd2c1e 100644
--- a/chromeos-base/syslog-cat/syslog-cat-0.0.1-r165.ebuild
+++ b/chromeos-base/syslog-cat/syslog-cat-0.0.1-r166.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "14d6946889ebac09c54e1fba8bc1e1b13ab78411" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "14d6946889ebac09c54e1fba8bc1e1b13ab78411" "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-r349.ebuild b/chromeos-base/system-proxy/system-proxy-0.0.1-r350.ebuild
similarity index 92%
rename from chromeos-base/system-proxy/system-proxy-0.0.1-r349.ebuild
rename to chromeos-base/system-proxy/system-proxy-0.0.1-r350.ebuild
index 4e1cf90..1eef5c9 100644
--- a/chromeos-base/system-proxy/system-proxy-0.0.1-r349.ebuild
+++ b/chromeos-base/system-proxy/system-proxy-0.0.1-r350.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "70b0fead532fb2583dfa6edeaabc09c1d55d2fc7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "fb8e41991af9e4c6c88768b137a9b48e4e5e47da" "70b0fead532fb2583dfa6edeaabc09c1d55d2fc7" "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-r4858.ebuild b/chromeos-base/system_api/system_api-0.0.1-r4859.ebuild
similarity index 95%
rename from chromeos-base/system_api/system_api-0.0.1-r4858.ebuild
rename to chromeos-base/system_api/system_api-0.0.1-r4859.ebuild
index 1dc8ca8..4f55fa6 100644
--- a/chromeos-base/system_api/system_api-0.0.1-r4858.ebuild
+++ b/chromeos-base/system_api/system_api-0.0.1-r4859.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "1341afbe61e8ddabb7a86b15e553b65d92db921d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "1341afbe61e8ddabb7a86b15e553b65d92db921d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/system_api/..."
 )
diff --git a/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r325.ebuild b/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r326.ebuild
similarity index 89%
rename from chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r325.ebuild
rename to chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r326.ebuild
index f6be511..31bff19 100644
--- a/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r325.ebuild
+++ b/chromeos-base/tast-local-helpers-cros/tast-local-helpers-cros-0.0.1-r326.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "299221f994dd63416c14201f29ded16d5bf9ebb5")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "bf03aea0f861ec5a30ee63b5814057ceee176ad9")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "f0233f823e10ba5e459e4cd68dfc993934b2559c")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "bf03aea0f861ec5a30ee63b5814057ceee176ad9")
 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/timberslide/timberslide-0.0.1-r1753.ebuild b/chromeos-base/timberslide/timberslide-0.0.1-r1754.ebuild
similarity index 87%
rename from chromeos-base/timberslide/timberslide-0.0.1-r1753.ebuild
rename to chromeos-base/timberslide/timberslide-0.0.1-r1754.ebuild
index bc839c2..b398bb6 100644
--- a/chromeos-base/timberslide/timberslide-0.0.1-r1753.ebuild
+++ b/chromeos-base/timberslide/timberslide-0.0.1-r1754.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "03fa7b4f0634999ce6aec1391ba9d90f1b0395dc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "03fa7b4f0634999ce6aec1391ba9d90f1b0395dc" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1009.ebuild b/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1010.ebuild
similarity index 90%
rename from chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1009.ebuild
rename to chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1010.ebuild
index 79da98c..ccd96a2 100644
--- a/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1009.ebuild
+++ b/chromeos-base/touch_firmware_calibration/touch_firmware_calibration-0.0.1-r1010.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "55f3832e43104006d40fb50872f058e8cd27f233" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "55f3832e43104006d40fb50872f058e8cd27f233" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1952.ebuild b/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1953.ebuild
similarity index 90%
rename from chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1952.ebuild
rename to chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1953.ebuild
index 1f122e6..f79a0ce 100644
--- a/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1952.ebuild
+++ b/chromeos-base/tpm2-simulator/tpm2-simulator-0.0.1-r1953.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "b2ae20cf5a237ca246eecb61de48d18247370fd5" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "b2ae20cf5a237ca246eecb61de48d18247370fd5" "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-r452.ebuild b/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r453.ebuild
similarity index 94%
rename from chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r452.ebuild
rename to chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r453.ebuild
index 21eeefa..b9c1f69 100644
--- a/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r452.ebuild
+++ b/chromeos-base/tpm_manager-client/tpm_manager-client-0.0.1-r453.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "944879c9353c2df8adb7022407a8d319671325c1" "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-r2615.ebuild b/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2616.ebuild
similarity index 95%
rename from chromeos-base/tpm_manager/tpm_manager-0.0.1-r2615.ebuild
rename to chromeos-base/tpm_manager/tpm_manager-0.0.1-r2616.ebuild
index 660a9d3..e044973 100644
--- a/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2615.ebuild
+++ b/chromeos-base/tpm_manager/tpm_manager-0.0.1-r2616.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "b90d0e8f789e8cfe86794cb3f36ae69967b7dc36" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "b90d0e8f789e8cfe86794cb3f36ae69967b7dc36" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "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-r486.ebuild b/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r487.ebuild
similarity index 91%
rename from chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r486.ebuild
rename to chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r487.ebuild
index c38d191..d3db280 100644
--- a/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r486.ebuild
+++ b/chromeos-base/tpm_softclear_utils/tpm_softclear_utils-0.0.1-r487.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e92f2290c63a51a33949ed1a9610b7c26e83d813" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "e92f2290c63a51a33949ed1a9610b7c26e83d813" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "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-r3291.ebuild b/chromeos-base/trunks/trunks-0.0.1-r3292.ebuild
similarity index 97%
rename from chromeos-base/trunks/trunks-0.0.1-r3291.ebuild
rename to chromeos-base/trunks/trunks-0.0.1-r3292.ebuild
index 18d4fc6..dc6f8888 100644
--- a/chromeos-base/trunks/trunks-0.0.1-r3291.ebuild
+++ b/chromeos-base/trunks/trunks-0.0.1-r3292.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "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-r358.ebuild b/chromeos-base/typecd/typecd-0.0.1-r359.ebuild
similarity index 94%
rename from chromeos-base/typecd/typecd-0.0.1-r358.ebuild
rename to chromeos-base/typecd/typecd-0.0.1-r359.ebuild
index df80069..2cfc1c4 100644
--- a/chromeos-base/typecd/typecd-0.0.1-r358.ebuild
+++ b/chromeos-base/typecd/typecd-0.0.1-r359.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "fa7554557aaddd2c63ee2c755c84e72a366d4302" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "fa7554557aaddd2c63ee2c755c84e72a366d4302" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/u2fd-client/u2fd-client-0.0.1-r70.ebuild b/chromeos-base/u2fd-client/u2fd-client-0.0.1-r71.ebuild
similarity index 89%
rename from chromeos-base/u2fd-client/u2fd-client-0.0.1-r70.ebuild
rename to chromeos-base/u2fd-client/u2fd-client-0.0.1-r71.ebuild
index 920011d..d293f7d 100644
--- a/chromeos-base/u2fd-client/u2fd-client-0.0.1-r70.ebuild
+++ b/chromeos-base/u2fd-client/u2fd-client-0.0.1-r71.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "b5881b78580dbead29183a70fdc260387f29d82a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "b5881b78580dbead29183a70fdc260387f29d82a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_USE_VCSID="1"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/u2fd/u2fd-0.0.1-r1544.ebuild b/chromeos-base/u2fd/u2fd-0.0.1-r1545.ebuild
similarity index 95%
rename from chromeos-base/u2fd/u2fd-0.0.1-r1544.ebuild
rename to chromeos-base/u2fd/u2fd-0.0.1-r1545.ebuild
index dedf7be..fe3f2ed 100644
--- a/chromeos-base/u2fd/u2fd-0.0.1-r1544.ebuild
+++ b/chromeos-base/u2fd/u2fd-0.0.1-r1545.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "b5881b78580dbead29183a70fdc260387f29d82a" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "944879c9353c2df8adb7022407a8d319671325c1" "b5881b78580dbead29183a70fdc260387f29d82a" "8ca9c97a07408fdff5abf480fb1b2a15405b6bc0" "2e036f417afe5d55dcbd138f7bfe2c98ab14403f" "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-r2085.ebuild b/chromeos-base/update_engine-client/update_engine-client-0.0.1-r2086.ebuild
similarity index 89%
rename from chromeos-base/update_engine-client/update_engine-client-0.0.1-r2085.ebuild
rename to chromeos-base/update_engine-client/update_engine-client-0.0.1-r2086.ebuild
index ac32f07..42a8ef3 100644
--- a/chromeos-base/update_engine-client/update_engine-client-0.0.1-r2085.ebuild
+++ b/chromeos-base/update_engine-client/update_engine-client-0.0.1-r2086.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "b1ecaff8d71f1229a4cf9a311003e4bc3ded78cf")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "372f10e79ea2c24a73cc3a7dc6e2a620e1486ac5")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "b1ecaff8d71f1229a4cf9a311003e4bc3ded78cf")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "372f10e79ea2c24a73cc3a7dc6e2a620e1486ac5")
 CROS_WORKON_LOCALNAME=("platform2" "aosp/system/update_engine")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/system/update_engine")
 CROS_WORKON_EGIT_BRANCH=("main" "master")
diff --git a/chromeos-base/update_engine/update_engine-0.0.3-r4161.ebuild b/chromeos-base/update_engine/update_engine-0.0.3-r4162.ebuild
similarity index 96%
rename from chromeos-base/update_engine/update_engine-0.0.3-r4161.ebuild
rename to chromeos-base/update_engine/update_engine-0.0.3-r4162.ebuild
index 1b3e67d..c360d48 100644
--- a/chromeos-base/update_engine/update_engine-0.0.3-r4161.ebuild
+++ b/chromeos-base/update_engine/update_engine-0.0.3-r4162.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f459f35d773d50b41d55dd786c61923bd27f2f92" "b1ecaff8d71f1229a4cf9a311003e4bc3ded78cf")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "41a4e9c452d2b7f10b9f7cd31aa95d3998ea8454" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "372f10e79ea2c24a73cc3a7dc6e2a620e1486ac5")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "b1ecaff8d71f1229a4cf9a311003e4bc3ded78cf")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "41a4e9c452d2b7f10b9f7cd31aa95d3998ea8454" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "372f10e79ea2c24a73cc3a7dc6e2a620e1486ac5")
 CROS_WORKON_LOCALNAME=("platform2" "aosp/system/update_engine")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/system/update_engine")
 CROS_WORKON_EGIT_BRANCH=("main" "master")
diff --git a/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r212.ebuild b/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r213.ebuild
similarity index 86%
rename from chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r212.ebuild
rename to chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r213.ebuild
index 9e9873c..9470586 100644
--- a/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r212.ebuild
+++ b/chromeos-base/ureadahead-diff/ureadahead-diff-0.0.1-r213.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a3eac5d15a46a63784099b3fe4af44a89d376a6f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a3eac5d15a46a63784099b3fe4af44a89d376a6f" "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-r557.ebuild b/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r558.ebuild
similarity index 93%
rename from chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r557.ebuild
rename to chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r558.ebuild
index 26f7a04..930686a 100644
--- a/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r557.ebuild
+++ b/chromeos-base/usb_bouncer/usb_bouncer-0.0.1-r558.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "974e43385202b259caed149a94f511942d087201" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "974e43385202b259caed149a94f511942d087201" "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-r1354.ebuild b/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1355.ebuild
similarity index 85%
rename from chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1354.ebuild
rename to chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1355.ebuild
index 8759d47..7f15651 100644
--- a/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1354.ebuild
+++ b/chromeos-base/userspace_touchpad/userspace_touchpad-0.0.1-r1355.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_DESTDIR="${S}"
diff --git a/chromeos-base/verity/verity-0.0.1-r306.ebuild b/chromeos-base/verity/verity-0.0.1-r307.ebuild
similarity index 88%
rename from chromeos-base/verity/verity-0.0.1-r306.ebuild
rename to chromeos-base/verity/verity-0.0.1-r307.ebuild
index 815a8f9..d148461 100644
--- a/chromeos-base/verity/verity-0.0.1-r306.ebuild
+++ b/chromeos-base/verity/verity-0.0.1-r307.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "a65107acb3c4cbbae51687d8409856f07b5dda27" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "a65107acb3c4cbbae51687d8409856f07b5dda27" "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-r947.ebuild b/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r948.ebuild
similarity index 91%
rename from chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r947.ebuild
rename to chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r948.ebuild
index 83f12bd..e1ac3da 100644
--- a/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r947.ebuild
+++ b/chromeos-base/virtual-file-provider/virtual-file-provider-0.0.1-r948.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "fc293354fb8ad9a9192d7ebfab15a03e8f0799ba" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "fc293354fb8ad9a9192d7ebfab15a03e8f0799ba" "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-r427.ebuild b/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r428.ebuild
similarity index 94%
rename from chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r427.ebuild
rename to chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r428.ebuild
index 30cd92fd..b9262c7 100644
--- a/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r427.ebuild
+++ b/chromeos-base/virtual-usb-printer/virtual-usb-printer-0.0.1-r428.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "768c633a4cdfd3ef1cb779e18997eac36152dd83")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a5bcfc0f633bf4f53ef09fcf2f8045ecbd51ab93")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "768c633a4cdfd3ef1cb779e18997eac36152dd83")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a5bcfc0f633bf4f53ef09fcf2f8045ecbd51ab93")
 CROS_WORKON_LOCALNAME=("platform2" "third_party/virtual-usb-printer")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/virtual-usb-printer")
 CROS_WORKON_EGIT_BRANCH=("main" "chromeos")
diff --git a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1375.ebuild b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1376.ebuild
similarity index 96%
rename from chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1375.ebuild
rename to chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1376.ebuild
index 8d738e8..dee128b 100644
--- a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1375.ebuild
+++ b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r1376.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7ef75a42aba67052842459f221271e681184cc89" "8c8679f9db77b724d522f2d6a76d3bfdfeae827e" "78a28564de27e03edbd93427ebc24aede3905082" "5159f439e8516f904859190cfd0375b7a4d05db2" "7c108bfa432bb4ff83e68e2ea1f884213ef29868" "97190407ff6df6ae497a54e632369afdf09cd621" "12dbe2245d86e86471aa84fb7656d3f422e1d6b6" "49733aa1ca831c8f507f6c0eae190e74c4c188d3" "f81fd2f617fbb538b0e48736020d89814f047321" "8ead32c3d109ae63ef89e4aa3b818aeb38b51d14" "aeddba56bfc6b1475cd7c298400145765f327a2f" "889e63b35e958b34d6cf15f62b243d442f1bac83" "64eb467661fb048cf581eb28e5ee0423136b4a02" "81465f23987dd2c482006411430ef171e856c5fe" "a01dc69a1e1fa54805fe9b48ce5c278a7e70de0c")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7ef75a42aba67052842459f221271e681184cc89" "8c8679f9db77b724d522f2d6a76d3bfdfeae827e" "78a28564de27e03edbd93427ebc24aede3905082" "5159f439e8516f904859190cfd0375b7a4d05db2" "7c108bfa432bb4ff83e68e2ea1f884213ef29868" "97190407ff6df6ae497a54e632369afdf09cd621" "12dbe2245d86e86471aa84fb7656d3f422e1d6b6" "49733aa1ca831c8f507f6c0eae190e74c4c188d3" "f81fd2f617fbb538b0e48736020d89814f047321" "8ead32c3d109ae63ef89e4aa3b818aeb38b51d14" "aeddba56bfc6b1475cd7c298400145765f327a2f" "889e63b35e958b34d6cf15f62b243d442f1bac83" "64eb467661fb048cf581eb28e5ee0423136b4a02" "81465f23987dd2c482006411430ef171e856c5fe" "a01dc69a1e1fa54805fe9b48ce5c278a7e70de0c")
 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-r1826.ebuild b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1827.ebuild
similarity index 97%
rename from chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1826.ebuild
rename to chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1827.ebuild
index e731d1e..fedbc57 100644
--- a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1826.ebuild
+++ b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1827.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "545d67a6429090226f1d6ac899f5f2d86bd38b99" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "9c2074e601aedb8358ee3b7c367c62042409c577" "3b33fc07daf512e548300eefbd028b622bc51b44" "7ef75a42aba67052842459f221271e681184cc89" "876b666eae5a63a4d1573c7d9fb1196a78dd6fad" "78a28564de27e03edbd93427ebc24aede3905082" "f2f8d1e7f3179d4c0673c8fe56b7ae0478f065ef" "59d684e9494215dbc87a3be67ed3ef4ee21a39da" "369b6c3d6ddd2bbf6b89585b7e1a156954faebd9" "10821612029dc3c4e863c760f918e55433e669cf" "e2598f8160f0e1089268ae21cb458eb6bc46d71e" "7cae38f61d328484fe9d49f19fc2cb49eb89e883" "1ff86d1c03040927751e5f099ac70d0a3194f21b" "8ead32c3d109ae63ef89e4aa3b818aeb38b51d14" "477938c1f2459147988d2039df85eeda34202514" "bc7248c2839eb191c34aa68d63e57ed5eb70768d" "64eb467661fb048cf581eb28e5ee0423136b4a02" "81465f23987dd2c482006411430ef171e856c5fe")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "545d67a6429090226f1d6ac899f5f2d86bd38b99" "509fcdecd3a70e50e5aa4e48d65de2dbd6decdb9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "9c2074e601aedb8358ee3b7c367c62042409c577" "3b33fc07daf512e548300eefbd028b622bc51b44" "7ef75a42aba67052842459f221271e681184cc89" "876b666eae5a63a4d1573c7d9fb1196a78dd6fad" "78a28564de27e03edbd93427ebc24aede3905082" "f2f8d1e7f3179d4c0673c8fe56b7ae0478f065ef" "59d684e9494215dbc87a3be67ed3ef4ee21a39da" "369b6c3d6ddd2bbf6b89585b7e1a156954faebd9" "10821612029dc3c4e863c760f918e55433e669cf" "e2598f8160f0e1089268ae21cb458eb6bc46d71e" "7cae38f61d328484fe9d49f19fc2cb49eb89e883" "1ff86d1c03040927751e5f099ac70d0a3194f21b" "8ead32c3d109ae63ef89e4aa3b818aeb38b51d14" "477938c1f2459147988d2039df85eeda34202514" "bc7248c2839eb191c34aa68d63e57ed5eb70768d" "64eb467661fb048cf581eb28e5ee0423136b4a02" "81465f23987dd2c482006411430ef171e856c5fe")
 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-r337.ebuild b/chromeos-base/vm_protos/vm_protos-0.0.1-r338.ebuild
similarity index 90%
rename from chromeos-base/vm_protos/vm_protos-0.0.1-r337.ebuild
rename to chromeos-base/vm_protos/vm_protos-0.0.1-r338.ebuild
index ffeb312..ac0cc58 100644
--- a/chromeos-base/vm_protos/vm_protos-0.0.1-r337.ebuild
+++ b/chromeos-base/vm_protos/vm_protos-0.0.1-r338.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "00ae29506296382180cec355ee3acb3662874ea9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "00ae29506296382180cec355ee3acb3662874ea9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/vm_tools/..."
 )
diff --git a/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2921.ebuild b/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2922.ebuild
similarity index 90%
rename from chromeos-base/vpn-manager/vpn-manager-0.0.1-r2921.ebuild
rename to chromeos-base/vpn-manager/vpn-manager-0.0.1-r2922.ebuild
index 339f99a..24d2046 100644
--- a/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2921.ebuild
+++ b/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2922.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "462cb7ad367bdc196dd234e5bae863472f6d704b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "462cb7ad367bdc196dd234e5bae863472f6d704b" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/vtpm/vtpm-0.0.1-r88.ebuild b/chromeos-base/vtpm/vtpm-0.0.1-r89.ebuild
similarity index 90%
rename from chromeos-base/vtpm/vtpm-0.0.1-r88.ebuild
rename to chromeos-base/vtpm/vtpm-0.0.1-r89.ebuild
index 9b0539e..4d35a8b 100644
--- a/chromeos-base/vtpm/vtpm-0.0.1-r88.ebuild
+++ b/chromeos-base/vtpm/vtpm-0.0.1-r89.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "5807b49f2a89205c10a0208e1124edffbff205af" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "46debaa1a374952167d5a2ca0bdf36013f053bc3" "944879c9353c2df8adb7022407a8d319671325c1" "0c8e3de65339e7e6a1ffe16a54c7ae719bacc57c" "5807b49f2a89205c10a0208e1124edffbff205af" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/webserver/webserver-0.0.1-r2487.ebuild b/chromeos-base/webserver/webserver-0.0.1-r2488.ebuild
similarity index 93%
rename from chromeos-base/webserver/webserver-0.0.1-r2487.ebuild
rename to chromeos-base/webserver/webserver-0.0.1-r2488.ebuild
index 89ae213..294633d 100644
--- a/chromeos-base/webserver/webserver-0.0.1-r2487.ebuild
+++ b/chromeos-base/webserver/webserver-0.0.1-r2488.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "78e6b102575514dd562d53f188ae1ed43deb839c" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "f4e705a84c3c965c7fdb404c95aaf83f31e7316d" "78e6b102575514dd562d53f188ae1ed43deb839c" "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-r270.ebuild b/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r271.ebuild
similarity index 89%
rename from chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r270.ebuild
rename to chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r271.ebuild
index 8f63aa5..833b2a9 100644
--- a/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r270.ebuild
+++ b/chromeos-base/wilco-dtc-grpc-protos/wilco-dtc-grpc-protos-0.0.1-r271.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "48152c166377a472e88e63a8996aeb920ac44e0a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "48152c166377a472e88e63a8996aeb920ac44e0a" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"chromiumos/wilco_dtc/..."
 )
diff --git a/dev-go/perfetto-protos/perfetto-protos-17.0-r1185.ebuild b/dev-go/perfetto-protos/perfetto-protos-17.0-r1186.ebuild
similarity index 89%
rename from dev-go/perfetto-protos/perfetto-protos-17.0-r1185.ebuild
rename to dev-go/perfetto-protos/perfetto-protos-17.0-r1186.ebuild
index 4e7b9b7..6b60028 100644
--- a/dev-go/perfetto-protos/perfetto-protos-17.0-r1185.ebuild
+++ b/dev-go/perfetto-protos/perfetto-protos-17.0-r1186.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("9b95139ed2811e3ff27912bfaf31c8ace8dc4a14" "f248db1f0fc22cac2345bc128a6a0a3276c7c430")
-CROS_WORKON_TREE=("b64a8926dd779c2ee2ae89e9073436d8c49693e5" "0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT=("9b95139ed2811e3ff27912bfaf31c8ace8dc4a14" "dbb1136242ba822d539eaf11493f3b68815adb7f")
+CROS_WORKON_TREE=("b64a8926dd779c2ee2ae89e9073436d8c49693e5" "60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_GO_PACKAGES=(
 	"android.googlesource.com/platform/external/perfetto/protos/perfetto/metrics/github.com/google/perfetto/perfetto_proto"
 	"android.googlesource.com/platform/external/perfetto/protos/perfetto/trace/github.com/google/perfetto/perfetto_proto"
diff --git a/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r231.ebuild b/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r232.ebuild
similarity index 97%
rename from dev-libs/libtextclassifier/libtextclassifier-0.0.1-r231.ebuild
rename to dev-libs/libtextclassifier/libtextclassifier-0.0.1-r232.ebuild
index ff09ae5..0d03d57 100644
--- a/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r231.ebuild
+++ b/dev-libs/libtextclassifier/libtextclassifier-0.0.1-r232.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "01652c17e116baa8ebd7083e8cbc3dede513ac9e")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4fa2be0611424952390eb570106ed5944e294b46")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "01652c17e116baa8ebd7083e8cbc3dede513ac9e")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4fa2be0611424952390eb570106ed5944e294b46")
 CROS_WORKON_LOCALNAME=("../platform2" "libtextclassifier")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/third_party/libtextclassifier")
 CROS_WORKON_EGIT_BRANCH=("main" "master")
diff --git a/dev-libs/libutf/libutf-0.0.1-r182.ebuild b/dev-libs/libutf/libutf-0.0.1-r183.ebuild
similarity index 87%
rename from dev-libs/libutf/libutf-0.0.1-r182.ebuild
rename to dev-libs/libutf/libutf-0.0.1-r183.ebuild
index ab09846..0d592da 100644
--- a/dev-libs/libutf/libutf-0.0.1-r182.ebuild
+++ b/dev-libs/libutf/libutf-0.0.1-r183.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "c17bb435be940edf1aff81469215bb6a071f3c38")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fc022abae9d52285526cb0dda697e2bea18696ca")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "c17bb435be940edf1aff81469215bb6a071f3c38")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "fc022abae9d52285526cb0dda697e2bea18696ca")
 CROS_WORKON_LOCALNAME=("../platform2" "../aosp/external/libutf")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/external/libutf")
 CROS_WORKON_EGIT_BRANCH=("main" "master")
diff --git a/dev-libs/ml-core/ml-core-0.0.1-r27.ebuild b/dev-libs/ml-core/ml-core-0.0.1-r28.ebuild
similarity index 84%
rename from dev-libs/ml-core/ml-core-0.0.1-r27.ebuild
rename to dev-libs/ml-core/ml-core-0.0.1-r28.ebuild
index 14472ba..8ae8f55 100644
--- a/dev-libs/ml-core/ml-core-0.0.1-r27.ebuild
+++ b/dev-libs/ml-core/ml-core-0.0.1-r28.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "4aad1773476a4fd5d6d51a5332a66ad94dd3aa13" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "4aad1773476a4fd5d6d51a5332a66ad94dd3aa13" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/dev-libs/modp_b64/modp_b64-0.0.1-r244.ebuild b/dev-libs/modp_b64/modp_b64-0.0.1-r245.ebuild
similarity index 90%
rename from dev-libs/modp_b64/modp_b64-0.0.1-r244.ebuild
rename to dev-libs/modp_b64/modp_b64-0.0.1-r245.ebuild
index c989a3f..d15e1be 100644
--- a/dev-libs/modp_b64/modp_b64-0.0.1-r244.ebuild
+++ b/dev-libs/modp_b64/modp_b64-0.0.1-r245.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "269b6fb8401617b85e2dff7ae8a7b0f97613e2cd")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "9473949bc842cc166ac244567638b94150a97865")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "269b6fb8401617b85e2dff7ae8a7b0f97613e2cd")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "9473949bc842cc166ac244567638b94150a97865")
 inherit cros-constants
 
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/modp_b64")
diff --git a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r975.ebuild b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r976.ebuild
similarity index 88%
rename from media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r975.ebuild
rename to media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r976.ebuild
index b74ecbb..145d7e6 100644
--- a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r975.ebuild
+++ b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r976.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "2de57cadefcee72268944188060875f71560d058" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "2de57cadefcee72268944188060875f71560d058" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/hal/usb camera/include camera/tools common-mk"
diff --git a/media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r8.ebuild b/media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r9.ebuild
similarity index 89%
rename from media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r8.ebuild
rename to media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r9.ebuild
index bd1e1cd..585ca6b 100644
--- a/media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r8.ebuild
+++ b/media-libs/cros-camera-auto-framing-tests/cros-camera-auto-framing-tests-0.0.1-r9.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "0db6495c85c9186f120853ea040436bf4259ef96" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "60fa47aebd6ebfb702012849bd560717fceddcd4" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # iioservice/ is included just to make sandbox happy when running `gn gen`.
diff --git a/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r487.ebuild b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r488.ebuild
similarity index 86%
rename from media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r487.ebuild
rename to media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r488.ebuild
index b7c7038..6e19089 100644
--- a/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r487.ebuild
+++ b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r488.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "318ca9f48604274cd31481e13eb9321be3d94d8f" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "318ca9f48604274cd31481e13eb9321be3d94d8f" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 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-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r109.ebuild b/media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r110.ebuild
similarity index 87%
rename from media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r109.ebuild
rename to media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r110.ebuild
index 56373c4..fe5ef07 100644
--- a/media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r109.ebuild
+++ b/media-libs/cros-camera-document-scanning-test/cros-camera-document-scanning-test-0.0.1-r110.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "7627e6797f3edbcec56c490a77967a4d416ccf15" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "7627e6797f3edbcec56c490a77967a4d416ccf15" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/features/document_scanning common-mk"
diff --git a/media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r237.ebuild b/media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r238.ebuild
similarity index 87%
rename from media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r237.ebuild
rename to media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r238.ebuild
index 8eb80c9..7712ad2 100644
--- a/media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r237.ebuild
+++ b/media-libs/cros-camera-gpu-test/cros-camera-gpu-test-0.0.1-r238.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/include camera/gpu camera/common common-mk"
diff --git a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r244.ebuild b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r245.ebuild
similarity index 89%
rename from media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r244.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r245.ebuild
index 087ff59..ba4a180 100644
--- a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r244.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r245.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "0db089197f74799a6a86522ab568a50a780bcbfb")
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "0db6495c85c9186f120853ea040436bf4259ef96" "47aba8606dfa27f4b75305cae2a7a23857ccec2d")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "0db089197f74799a6a86522ab568a50a780bcbfb")
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "60fa47aebd6ebfb702012849bd560717fceddcd4" "47aba8606dfa27f4b75305cae2a7a23857ccec2d")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/platform/camera")
 CROS_WORKON_LOCALNAME=("../platform2" "../platform/camera")
 CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/camera_hal")
diff --git a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r815.ebuild b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r816.ebuild
similarity index 88%
rename from media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r815.ebuild
rename to media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r816.ebuild
index 76f6ec5..79ee20b 100644
--- a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r815.ebuild
+++ b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r816.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "9ff7c0ea2761e1863475bcd96a983e5e18089f57" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "9ff7c0ea2761e1863475bcd96a983e5e18089f57" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 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 chromeos-config common-mk"
diff --git a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1210.ebuild b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1211.ebuild
similarity index 91%
rename from media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1210.ebuild
rename to media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1211.ebuild
index c0d095b..4115af8 100644
--- a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1210.ebuild
+++ b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r1211.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 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-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r351.ebuild b/media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r352.ebuild
similarity index 89%
rename from media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r351.ebuild
rename to media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r352.ebuild
index c199ae8..916498f 100644
--- a/media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r351.ebuild
+++ b/media-libs/cros-camera-hdrnet-tests/cros-camera-hdrnet-tests-0.0.1-r352.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "0db6495c85c9186f120853ea040436bf4259ef96" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "34c825a80bd71bac019bf7a5a2b2832c4c9ba3a9" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "29d52c6d2464057e3fde8214a173f96d96f3b267" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "aae8bf048bbe1147ff2aa47f59de29bad1b6355d" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "60fa47aebd6ebfb702012849bd560717fceddcd4" "8a9ef8758fbc933dbbb61914e0a924d6fd9626f6" "6c730fa6bc9c00d204b80c4944f1951b8f35a48e")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # iioservice/ is included just to make sandbox happy when running `gn gen`.
diff --git a/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r788.ebuild b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r789.ebuild
similarity index 83%
rename from media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r788.ebuild
rename to media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r789.ebuild
index 64b7639..2eef9da 100644
--- a/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r788.ebuild
+++ b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r789.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r471.ebuild b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r472.ebuild
similarity index 84%
rename from media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r471.ebuild
rename to media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r472.ebuild
index 1ec0678..e22525d 100644
--- a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r471.ebuild
+++ b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r472.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 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-libfs/cros-camera-libfs-0.0.1-r64.ebuild b/media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r65.ebuild
similarity index 96%
rename from media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r64.ebuild
rename to media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r65.ebuild
index 9661ad0..175b2e4 100644
--- a/media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r64.ebuild
+++ b/media-libs/cros-camera-libfs/cros-camera-libfs-0.0.1-r65.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "835ea099c8643676eca960bb95a9349559008807" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "835ea099c8643676eca960bb95a9349559008807" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/libfs common-mk"
diff --git a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r791.ebuild b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r792.ebuild
similarity index 82%
rename from media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r791.ebuild
rename to media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r792.ebuild
index 3512462..d0ea639 100644
--- a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r791.ebuild
+++ b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r792.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r844.ebuild b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r845.ebuild
similarity index 83%
rename from media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r844.ebuild
rename to media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r845.ebuild
index 90f8487..ff7e1d1 100644
--- a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r844.ebuild
+++ b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r845.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r971.ebuild b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r972.ebuild
similarity index 90%
rename from media-libs/cros-camera-test/cros-camera-test-0.0.1-r971.ebuild
rename to media-libs/cros-camera-test/cros-camera-test-0.0.1-r972.ebuild
index 2eb9767..fccc0aa 100644
--- a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r971.ebuild
+++ b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r972.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "97e2f0b1a81d232f739ef5fef9fa68657759387f" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "97e2f0b1a81d232f739ef5fef9fa68657759387f" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "527abd7a988a45572305a6c44b5324d0d9cf8be2" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 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-usb-tests/cros-camera-usb-tests-0.0.1-r141.ebuild b/media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r142.ebuild
similarity index 88%
rename from media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r141.ebuild
rename to media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r142.ebuild
index 4094eb7..42fd546 100644
--- a/media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r141.ebuild
+++ b/media-libs/cros-camera-usb-tests/cros-camera-usb-tests-0.0.1-r142.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "0db6495c85c9186f120853ea040436bf4259ef96")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "4be8d3ae5664634825afc2e6e4b8c24816ee9b9e" "f4e43ea494df44704ba2c63dc081d63a689e6a41" "fcb83ee936c01758d591bb6f7a7734f054dd30ae" "66167969f21d9a7bd20fc7fd2e582ad849d7d8eb" "60fa47aebd6ebfb702012849bd560717fceddcd4")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/hal/usb common-mk"
diff --git a/net-print/cups_proxy/cups_proxy-0.0.1-r317.ebuild b/net-print/cups_proxy/cups_proxy-0.0.1-r318.ebuild
similarity index 91%
rename from net-print/cups_proxy/cups_proxy-0.0.1-r317.ebuild
rename to net-print/cups_proxy/cups_proxy-0.0.1-r318.ebuild
index c06ad34..f11c013 100644
--- a/net-print/cups_proxy/cups_proxy-0.0.1-r317.ebuild
+++ b/net-print/cups_proxy/cups_proxy-0.0.1-r318.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="6"
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "7b0ea4ad0dd55c624cbdc60df9bfaeea9b2481a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "7b0ea4ad0dd55c624cbdc60df9bfaeea9b2481a6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/net-wireless/floss/floss-0.0.2-r1436.ebuild b/net-wireless/floss/floss-0.0.2-r1437.ebuild
similarity index 97%
rename from net-wireless/floss/floss-0.0.2-r1436.ebuild
rename to net-wireless/floss/floss-0.0.2-r1437.ebuild
index 2c9941f..1325c89 100644
--- a/net-wireless/floss/floss-0.0.2-r1436.ebuild
+++ b/net-wireless/floss/floss-0.0.2-r1437.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305" "fea37ca09aae56eb5a50f45991b206f92af1e7e8")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411" "97c098e228b4560e214854eadb06218a4f00b2dd")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305" "fea37ca09aae56eb5a50f45991b206f92af1e7e8")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411" "97c098e228b4560e214854eadb06218a4f00b2dd")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"aosp/platform/packages/modules/Bluetooth"
diff --git a/net-wireless/floss_tools/floss_tools-0.0.1-r224.ebuild b/net-wireless/floss_tools/floss_tools-0.0.1-r225.ebuild
similarity index 93%
rename from net-wireless/floss_tools/floss_tools-0.0.1-r224.ebuild
rename to net-wireless/floss_tools/floss_tools-0.0.1-r225.ebuild
index 499a6e1..752f581 100644
--- a/net-wireless/floss_tools/floss_tools-0.0.1-r224.ebuild
+++ b/net-wireless/floss_tools/floss_tools-0.0.1-r225.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "19ddacfca78cbce374e74fa06db41100af9e9850" "c2caeafe6e7132ab292b93e9c550f361f313041e" "68b356f2e7a8c6103eff9662d1d37d52a0f49305")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "ebc94095def7b9d97104e9574b06f31139765b85" "fd5985c8c7d26a91db0bef215a0ee6b974567add" "c3473ab29243f136628d4c8708ab647c15f6a411")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"aosp/platform/packages/modules/Bluetooth"
diff --git a/sys-apps/fitpicker/fitpicker-0.0.1-r2222.ebuild b/sys-apps/fitpicker/fitpicker-0.0.1-r2223.ebuild
similarity index 85%
rename from sys-apps/fitpicker/fitpicker-0.0.1-r2222.ebuild
rename to sys-apps/fitpicker/fitpicker-0.0.1-r2223.ebuild
index c5696ab..188b573 100644
--- a/sys-apps/fitpicker/fitpicker-0.0.1-r2222.ebuild
+++ b/sys-apps/fitpicker/fitpicker-0.0.1-r2223.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f248db1f0fc22cac2345bc128a6a0a3276c7c430"
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "4ece3f8f3d85b6237e276452a02c7c6044463211" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="dbb1136242ba822d539eaf11493f3b68815adb7f"
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "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-r1454.ebuild b/sys-apps/mosys/mosys-1.2.3-r1455.ebuild
similarity index 94%
rename from sys-apps/mosys/mosys-1.2.3-r1454.ebuild
rename to sys-apps/mosys/mosys-1.2.3-r1455.ebuild
index fd84e25..588d8b6 100644
--- a/sys-apps/mosys/mosys-1.2.3-r1454.ebuild
+++ b/sys-apps/mosys/mosys-1.2.3-r1455.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f248db1f0fc22cac2345bc128a6a0a3276c7c430" "73b4433e502690d622075f47dde18849bfbbb2a5")
-CROS_WORKON_TREE=("0db6495c85c9186f120853ea040436bf4259ef96" "1ea13e9e3e2cc1fabd9775806e986787d736562b")
+CROS_WORKON_COMMIT=("dbb1136242ba822d539eaf11493f3b68815adb7f" "73b4433e502690d622075f47dde18849bfbbb2a5")
+CROS_WORKON_TREE=("60fa47aebd6ebfb702012849bd560717fceddcd4" "1ea13e9e3e2cc1fabd9775806e986787d736562b")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform2"
 	"chromiumos/platform/mosys"