diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r3458.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r3459.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r3458.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r3459.ebuild
index 5812d8a..b733ca8 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r3458.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r3459.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f5b42274efd9b5314faca9616c728612bf2de531" "1a02d7691e8dbccfe03cbb1aab896c2af2e76216")
-CROS_WORKON_TREE=("6d9fc52524a9ec4eb18be18e0e7617e86a577a6a" "5568c73639cec70923a2d080c3f76c73b6e35c16")
+CROS_WORKON_COMMIT=("cb442c95b69fa0c687e8179dc30e098fc147dad0" "1a02d7691e8dbccfe03cbb1aab896c2af2e76216")
+CROS_WORKON_TREE=("699806850a81cf74aa995591fad682ffd4465364" "5568c73639cec70923a2d080c3f76c73b6e35c16")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8197.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8198.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8197.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8198.ebuild
index 5221313..8448bcf 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8197.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8198.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f5b42274efd9b5314faca9616c728612bf2de531" "1e2e9d7183f545eefd1a86a07b0ab6f91d837a6c")
-CROS_WORKON_TREE=("6d9fc52524a9ec4eb18be18e0e7617e86a577a6a" "fdbc51bbd5a7ee9d532ea1aa30cf21e57ca199db")
+CROS_WORKON_COMMIT=("cb442c95b69fa0c687e8179dc30e098fc147dad0" "1e2e9d7183f545eefd1a86a07b0ab6f91d837a6c")
+CROS_WORKON_TREE=("699806850a81cf74aa995591fad682ffd4465364" "fdbc51bbd5a7ee9d532ea1aa30cf21e57ca199db")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r54.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r55.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r54.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r55.ebuild
index f8dc43a..cd62bd8 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r54.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r55.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f5b42274efd9b5314faca9616c728612bf2de531" "1e2e9d7183f545eefd1a86a07b0ab6f91d837a6c")
-CROS_WORKON_TREE=("6d9fc52524a9ec4eb18be18e0e7617e86a577a6a" "fdbc51bbd5a7ee9d532ea1aa30cf21e57ca199db")
+CROS_WORKON_COMMIT=("cb442c95b69fa0c687e8179dc30e098fc147dad0" "1e2e9d7183f545eefd1a86a07b0ab6f91d837a6c")
+CROS_WORKON_TREE=("699806850a81cf74aa995591fad682ffd4465364" "fdbc51bbd5a7ee9d532ea1aa30cf21e57ca199db")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6205.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6206.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r6205.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r6206.ebuild
index 78addeb..3a4f10a 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6205.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6206.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="f5b42274efd9b5314faca9616c728612bf2de531"
-CROS_WORKON_TREE="6d9fc52524a9ec4eb18be18e0e7617e86a577a6a"
+CROS_WORKON_COMMIT="cb442c95b69fa0c687e8179dc30e098fc147dad0"
+CROS_WORKON_TREE="699806850a81cf74aa995591fad682ffd4465364"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 PYTHON_COMPAT=( python2_7 )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5309.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5310.ebuild
similarity index 87%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5309.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5310.ebuild
index 6ffc6e5..8e0d025 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5309.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5310.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f5b42274efd9b5314faca9616c728612bf2de531"
-CROS_WORKON_TREE="6d9fc52524a9ec4eb18be18e0e7617e86a577a6a"
+CROS_WORKON_COMMIT="cb442c95b69fa0c687e8179dc30e098fc147dad0"
+CROS_WORKON_TREE="699806850a81cf74aa995591fad682ffd4465364"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ec-utils/ec-utils-0.0.2-r8137.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r8138.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r8137.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r8138.ebuild
index 151aae7f..4cde753 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r8137.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r8138.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f5b42274efd9b5314faca9616c728612bf2de531"
-CROS_WORKON_TREE="6d9fc52524a9ec4eb18be18e0e7617e86a577a6a"
+CROS_WORKON_COMMIT="cb442c95b69fa0c687e8179dc30e098fc147dad0"
+CROS_WORKON_TREE="699806850a81cf74aa995591fad682ffd4465364"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/net-wireless/bluez/bluez-5.54-r435.ebuild b/net-wireless/bluez/bluez-5.54-r436.ebuild
similarity index 96%
rename from net-wireless/bluez/bluez-5.54-r435.ebuild
rename to net-wireless/bluez/bluez-5.54-r436.ebuild
index ea16c23..ebe3ca7 100644
--- a/net-wireless/bluez/bluez-5.54-r435.ebuild
+++ b/net-wireless/bluez/bluez-5.54-r436.ebuild
@@ -7,8 +7,8 @@
 # projects are declared. During emerge, both project sources are copied to
 # their respective destination directories, and one is chosen as the
 # "working directory" in src_unpack() below based on bluez-next USE flag.
-CROS_WORKON_COMMIT=("58ea14f29738fe96bb42995efee6e644a59cc67b" "58ea14f29738fe96bb42995efee6e644a59cc67b" "7f4bdf382062728c383678e13cb0128282f91b71")
-CROS_WORKON_TREE=("4eb684e9a2bf8fa938782d2fe95e8d34bde23f76" "4eb684e9a2bf8fa938782d2fe95e8d34bde23f76" "d856bf5012d82830bf46beadf8d5f1f82ad055f8")
+CROS_WORKON_COMMIT=("58ea14f29738fe96bb42995efee6e644a59cc67b" "58ea14f29738fe96bb42995efee6e644a59cc67b" "9c8538c1711e9e3e9db440e145dac0e71bb7158a")
+CROS_WORKON_TREE=("4eb684e9a2bf8fa938782d2fe95e8d34bde23f76" "4eb684e9a2bf8fa938782d2fe95e8d34bde23f76" "1822327310dbed10e7a1da2468af95c6d2567043")
 CROS_WORKON_LOCALNAME=("bluez/current" "bluez/next" "bluez/upstream")
 CROS_WORKON_PROJECT=("chromiumos/third_party/bluez" "chromiumos/third_party/bluez" "chromiumos/third_party/bluez")
 CROS_WORKON_OPTIONAL_CHECKOUT=(