diff --git a/metadata/md5-cache/chromeos-base/chromite-0.0.2-r7537 b/metadata/md5-cache/chromeos-base/chromite-0.0.2-r7538
similarity index 80%
rename from metadata/md5-cache/chromeos-base/chromite-0.0.2-r7537
rename to metadata/md5-cache/chromeos-base/chromite-0.0.2-r7538
index d3405c7..6c8b7ab 100644
--- a/metadata/md5-cache/chromeos-base/chromite-0.0.2-r7537
+++ b/metadata/md5-cache/chromeos-base/chromite-0.0.2-r7538
@@ -3,11 +3,11 @@
 DESCRIPTION=Subset of chromite libs for importing on DUTs
 EAPI=7
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/chromite/
-IUSE=cros_host cros_workon_tree_6a52b8adcab8035de735cd653d8f7119c4f315e0 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=cros_host cros_workon_tree_2bd5ae10625d45b113815cc9e27d73254ba2e017 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live
 RESTRICT=test
-SLOT=0/0.0.2-r7537
+SLOT=0/0.0.2-r7538
 _eclasses_=cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=711712448f8ebc19e7dcea1093aa5768
+_md5_=35ca56e9d6ea7b02c35c87cacf51e3a2
diff --git a/metadata/md5-cache/chromeos-base/diagnostics-0.0.1-r884 b/metadata/md5-cache/chromeos-base/diagnostics-0.0.1-r885
similarity index 90%
rename from metadata/md5-cache/chromeos-base/diagnostics-0.0.1-r884
rename to metadata/md5-cache/chromeos-base/diagnostics-0.0.1-r885
index fba90b5..17a28ea 100644
--- a/metadata/md5-cache/chromeos-base/diagnostics-0.0.1-r884
+++ b/metadata/md5-cache/chromeos-base/diagnostics-0.0.1-r885
@@ -4,11 +4,11 @@
 DESCRIPTION=Device telemetry and diagnostics for Chrome OS
 EAPI=7
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform2/+/master/diagnostics
-IUSE=fuzzer wilco generated_cros_config unibuild cros_host cros_workon_tree_52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb_4a9d701c1716dbba6b3de3a9927299f399ec4580_c20bd33974506b3ccc353cae59a9c61cec343fb8_e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb cros-debug fuzzer asan coverage fuzzer msan tsan ubsan cros_host cros_workon_tree_52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb_4a9d701c1716dbba6b3de3a9927299f399ec4580_c20bd33974506b3ccc353cae59a9c61cec343fb8_e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb cros-debug compilation_database cros_host test
+IUSE=fuzzer wilco generated_cros_config unibuild cros_host cros_workon_tree_52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb_4a9d701c1716dbba6b3de3a9927299f399ec4580_dde835d8e5d4e90e900043932ec617f548d7e7da_e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb cros-debug fuzzer asan coverage fuzzer msan tsan ubsan cros_host cros_workon_tree_52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb_4a9d701c1716dbba6b3de3a9927299f399ec4580_dde835d8e5d4e90e900043932ec617f548d7e7da_e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb cros-debug compilation_database cros_host test
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live live
 RDEPEND=unibuild? ( !generated_cros_config? ( chromeos-base/chromeos-config:= ) generated_cros_config? ( chromeos-base/chromeos-config-bsp:= ) ) chromeos-base/chromeos-config-tools:= dev-libs/protobuf:= dev-libs/re2:= net-libs/grpc:= virtual/libudev:= chromeos-base/minijail dev-util/stressapptest wilco? ( sys-block/fio chromeos-base/chromeos-dtc-vm chromeos-base/vpd ) >=chromeos-base/libchrome-0.0.1-r117:0=[cros-debug=] >=chromeos-base/libbrillo-0.0.1-r1651:= sys-apps/baselayout
-SLOT=0/0.0.1-r884
+SLOT=0/0.0.1-r885
 _eclasses_=cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-debug	d2750757005d6a444f8eb12bb9eb9944	cros-fuzzer	b480bfcdd51a928c9a2254c6641649a2	cros-sanitizers	57b514c0d35fe88c97590a2a19e95e4d	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	libchrome	b0adbfd1a2eae79766f7256eaad1da23	libchrome-version	f89118941e7f3c3825d2fe216c977c57	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	platform	cd60a3aa853d28001988f2b07bf2e56c	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	udev	452708c3f55cf6e918b045adb949a9e6	user	7c566af8c48023219fd63246e88d6621
-_md5_=3b4202f4d05dfd2bf02396b830dd3102
+_md5_=b9428e81ac447f6ece5a069a14c80678
diff --git a/metadata/md5-cache/chromeos-base/diagnostics-dpsl-test-0.0.1-r571 b/metadata/md5-cache/chromeos-base/diagnostics-dpsl-test-0.0.1-r572
similarity index 90%
rename from metadata/md5-cache/chromeos-base/diagnostics-dpsl-test-0.0.1-r571
rename to metadata/md5-cache/chromeos-base/diagnostics-dpsl-test-0.0.1-r572
index 4df1776..f3b6fff 100644
--- a/metadata/md5-cache/chromeos-base/diagnostics-dpsl-test-0.0.1-r571
+++ b/metadata/md5-cache/chromeos-base/diagnostics-dpsl-test-0.0.1-r572
@@ -3,11 +3,11 @@
 DESCRIPTION=Diagnostics DPSL test designed to be run inside VM
 EAPI=6
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform2/+/master/diagnostics/dpsl/
-IUSE=cros_host cros_workon_tree_52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb_c20bd33974506b3ccc353cae59a9c61cec343fb8_e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb cros-debug fuzzer asan coverage fuzzer msan tsan ubsan cros_host cros_workon_tree_52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb_c20bd33974506b3ccc353cae59a9c61cec343fb8_e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb cros-debug compilation_database cros_host test
+IUSE=cros_host cros_workon_tree_52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb_dde835d8e5d4e90e900043932ec617f548d7e7da_e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb cros-debug fuzzer asan coverage fuzzer msan tsan ubsan cros_host cros_workon_tree_52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb_dde835d8e5d4e90e900043932ec617f548d7e7da_e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb cros-debug compilation_database cros_host test
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live live
 RDEPEND=net-libs/grpc:= dev-libs/protobuf:= >=chromeos-base/libchrome-0.0.1-r117:0=[cros-debug=] >=chromeos-base/libbrillo-0.0.1-r1651:=
 SLOT=0
 _eclasses_=cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-debug	d2750757005d6a444f8eb12bb9eb9944	cros-fuzzer	b480bfcdd51a928c9a2254c6641649a2	cros-sanitizers	57b514c0d35fe88c97590a2a19e95e4d	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	libchrome	b0adbfd1a2eae79766f7256eaad1da23	libchrome-version	f89118941e7f3c3825d2fe216c977c57	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	e32940a7b2a9992ad217eccddb84d548	platform	cd60a3aa853d28001988f2b07bf2e56c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23f41017bfb8a1db645e24a3a8aaa1d9
+_md5_=e8394f7fa715391f6181a7c21df461e8
diff --git a/metadata/md5-cache/chromeos-base/factory-0.2.0-r1966 b/metadata/md5-cache/chromeos-base/factory-0.2.0-r1967
similarity index 85%
rename from metadata/md5-cache/chromeos-base/factory-0.2.0-r1966
rename to metadata/md5-cache/chromeos-base/factory-0.2.0-r1967
index 77d1486..606a88ed 100644
--- a/metadata/md5-cache/chromeos-base/factory-0.2.0-r1966
+++ b/metadata/md5-cache/chromeos-base/factory-0.2.0-r1967
@@ -4,11 +4,11 @@
 DESCRIPTION=Chrome OS Factory Software Platform
 EAPI=7
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform/factory/
-IUSE=cros_host cros_workon_tree_da06bc9cdf4614db2c027023d9f327833c2e4bd3 python_targets_python3_6 python_targets_python3_7
+IUSE=cros_host cros_workon_tree_d971542dd40752467b234475febda9011d37afbc python_targets_python3_6 python_targets_python3_7
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live
-SLOT=0/0.2.0-r1966
+SLOT=0/0.2.0-r1967
 SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror//distfiles/webgl-aquarium-20130524.tar.bz2
 _eclasses_=cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-factory	a2ce0261e426513fe3f7540d9a228910	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=94a68f7a6da784df0f18bd4cb2bc6114
+_md5_=e7826a9ae3162c16d796af18d4342c62
diff --git a/metadata/md5-cache/chromeos-base/factory-mini-0.0.1-r2036 b/metadata/md5-cache/chromeos-base/factory-mini-0.0.1-r2037
similarity index 86%
rename from metadata/md5-cache/chromeos-base/factory-mini-0.0.1-r2036
rename to metadata/md5-cache/chromeos-base/factory-mini-0.0.1-r2037
index c7fdd59..3ffff38 100644
--- a/metadata/md5-cache/chromeos-base/factory-mini-0.0.1-r2036
+++ b/metadata/md5-cache/chromeos-base/factory-mini-0.0.1-r2037
@@ -3,11 +3,11 @@
 DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jsonrpclib:= dev-python/pyyaml:= dev-python/protobuf-python:= virtual/chromeos-bsp-factory:= virtual/chromeos-regions:=
 DESCRIPTION=Subset of factory software to be installed in test images
 EAPI=7
-IUSE=cros_host cros_workon_tree_da06bc9cdf4614db2c027023d9f327833c2e4bd3 python_targets_python3_6 python_targets_python3_7
+IUSE=cros_host cros_workon_tree_d971542dd40752467b234475febda9011d37afbc python_targets_python3_6 python_targets_python3_7
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live
-SLOT=0/0.0.1-r2036
+SLOT=0/0.0.1-r2037
 SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror//distfiles/webgl-aquarium-20130524.tar.bz2
 _eclasses_=cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=1fc5f9b370f56ded36e9c44d5527d166
+_md5_=26203197995e6d8e1d90c072ce9b4e16