diff --git a/configs/gftv100_defconfig b/configs/gftv100_defconfig
index 7a7e5c2..f99a109 100644
--- a/configs/gftv100_defconfig
+++ b/configs/gftv100_defconfig
@@ -121,5 +121,3 @@
 BR2_TARGET_ROOTFS_GINSTALL_LOADER_DIR="../vendor/broadcom/cfe-bin/gftv100"
 BR2_PACKAGE_BCM_COMMON_PLATFORM="97425"
 BR2_PACKAGE_BCM_COMMON_PLATFORM_REV="B2"
-BR2_PACKAGE_GOOGLE_OREGANO=y
-BR2_PACKAGE_GOOGLE_DART_VM=y
diff --git a/configs/kvm_defconfig b/configs/kvm_defconfig
index 18dbc62..5c75ce2 100644
--- a/configs/kvm_defconfig
+++ b/configs/kvm_defconfig
@@ -30,7 +30,6 @@
 BR2_PACKAGE_PYTHON_BZIP2=y
 BR2_PACKAGE_PYTHON_PYEXPAT=y
 BR2_PACKAGE_PYTHON_SSL=y
-BR2_PACKAGE_PYTHON_ZLIB=y
 BR2_PACKAGE_PYTHON_IPV6=y
 BR2_PACKAGE_PY_GOOGLE_API=y
 BR2_PACKAGE_PY_MONOTIME=y
@@ -72,12 +71,6 @@
 BR2_PACKAGE_MODULE_INIT_TOOLS=y
 BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT=y
 BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y
-BR2_PACKAGE_GOOGLE_DVBCAPTURE=y
-BR2_PACKAGE_GOOGLE_FREETYPEJNI=y
-BR2_PACKAGE_GOOGLE_IMAGELOADJNI=y
-BR2_PACKAGE_GOOGLE_JTUX=y
-BR2_PACKAGE_GOOGLE_MPEGPARSER=y
-BR2_PACKAGE_GOOGLE_TVSTREAMPARSER=y
 BR2_PACKAGE_GOOGLE_HNVRAM=y
 BR2_PACKAGE_GOOGLE_PLATFORM=y
 BR2_PACKAGE_GOOGLE_PLATFORM_BASE=y
diff --git a/package/bcm_common/Config.in b/package/bcm_common/Config.in
index 4e81c95..92d7b00 100644
--- a/package/bcm_common/Config.in
+++ b/package/bcm_common/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BCM_COMMON
 	bool "Build Broadcom common package"
+	depends on !BR2_PACKAGE_GOOGLE_PLATFORM_ONLY
 config BR2_PACKAGE_BCM_COMMON_PLATFORM
 	string "Broadcom target platform"
 	default "97425"
diff --git a/package/bcm_drivers/Config.in b/package/bcm_drivers/Config.in
index 4eeb9d4..ccf7142 100644
--- a/package/bcm_drivers/Config.in
+++ b/package/bcm_drivers/Config.in
@@ -6,6 +6,7 @@
 	config BR2_PACKAGE_BCM_DRIVER_MOCA
 		bool "Enable Broadcom MoCA Driver v1"
 		select BR2_PACKAGE_BCM_COMMON
+		depends on BR2_PACKAGE_BCM_DRIVERS
 		depends on !BR2_PACKAGE_BCM_DRIVER_MOCA2
 		default n
 		help
@@ -13,17 +14,19 @@
 	config BR2_PACKAGE_BCM_DRIVER_MOCA2
 		bool "Enable Broadcom MoCA Driver v2"
 		select BR2_PACKAGE_BCM_COMMON
+		depends on BR2_PACKAGE_BCM_DRIVERS
 		default n
 		help
 		  Includes Broadcom MoCA 2.0 driver for 6802/6803/742x.
 	config BR2_PACKAGE_BCM_DRIVER_WIFI
 		bool "Enable Broadcom WiFi Driver"
 		select BR2_PACKAGE_BCM_COMMON
+		depends on BR2_PACKAGE_BCM_DRIVERS
 		default n
 		help
 		  Includes Broadcom Wifi driver.
-    config BR2_PACKAGE_BCM_DRIVER_WIFI_USB
-        bool "Enable Broadcom WiFi Driver for USB dongles"
-        default n
-        depends on BR2_PACKAGE_BCM_DRIVER_WIFI
+	config BR2_PACKAGE_BCM_DRIVER_WIFI_USB
+		bool "Enable Broadcom WiFi Driver for USB dongles"
+		default n
+		depends on BR2_PACKAGE_BCM_DRIVER_WIFI
 endmenu
diff --git a/package/google/google_platform/Config.in b/package/google/google_platform/Config.in
index 5e8349a..9b5e24e 100644
--- a/package/google/google_platform/Config.in
+++ b/package/google/google_platform/Config.in
@@ -36,7 +36,6 @@
 config BR2_PACKAGE_GOOGLE_TEST
 	bool "Include Test Packages"
 	default n
-	select BR2_PACKAGE_GOOGLE_OOKLA if BR2_mipsel
 	select BR2_PACKAGE_BONNIE
 	select BR2_PACKAGE_CRASHME
 	select BR2_PACKAGE_DHRYSTONE
@@ -90,9 +89,12 @@
 	default n
 	depends on !BR2_PACKAGE_GOOGLE_PLATFORM_ONLY
 	select BR2_PACKAGE_GOOGLE_CHANNEL_SRV
+	select BR2_PACKAGE_GOOGLE_DVBCAPTURE
 	select BR2_PACKAGE_GOOGLE_HDHOMERUN_PLUGIN
 	select BR2_PACKAGE_GOOGLE_MCASTCAPTURE
 	select BR2_PACKAGE_GOOGLE_MPEGPARSER
+	select BR2_PACKAGE_GOOGLE_OOKLA if BR2_mipsel
+	select BR2_PACKAGE_GOOGLE_OREGANO
 	select BR2_PACKAGE_GOOGLE_PULLREADER
 	select BR2_PACKAGE_GOOGLE_SAGE_ANALYTICS_PLUGIN
 	select BR2_PACKAGE_GOOGLE_SAGEJNI
@@ -117,6 +119,8 @@
 	select BR2_PACKAGE_GOOGLE_MINICLIENT
 	select BR2_PACKAGE_GOOGLE_MOBILE_API
 	select BR2_PACKAGE_GOOGLE_MPEGPARSER
+	select BR2_PACKAGE_GOOGLE_OOKLA if BR2_mipsel
+	select BR2_PACKAGE_GOOGLE_OREGANO
 	select BR2_PACKAGE_GOOGLE_SAGE_ANALYTICS_PLUGIN
 	select BR2_PACKAGE_GOOGLE_SAGEJNI
 	select BR2_PACKAGE_GOOGLE_SAGESERVER
diff --git a/package/google/google_skelmir/Config.in b/package/google/google_skelmir/Config.in
index 7f33972..b174dc9 100644
--- a/package/google/google_skelmir/Config.in
+++ b/package/google/google_skelmir/Config.in
@@ -1,4 +1,5 @@
 config BR2_PACKAGE_GOOGLE_SKELMIR
         bool "google_skelmir"
+        depends on !BR2_PACKAGE_GOOGLE_PLATFORM_ONLY
         help
           Installs the Skelmir Java VM