diff --git a/device.mk b/device.mk
index 61dc81ae..1632d6a4 100644
--- a/device.mk
+++ b/device.mk
@@ -899,10 +899,10 @@ USE_EARLY_SEND_DEVICE_INFO := true
 
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
-endif
 
 #GPS HAL
 include device/google/gs201/gnss/device-gnss.mk
+endif
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/gps
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
diff --git a/modem/userdebug.mk b/modem/userdebug.mk
index ba4c0e9d..2b0c3983 100644
--- a/modem/userdebug.mk
+++ b/modem/userdebug.mk
@@ -1 +1,3 @@
-PRODUCT_PACKAGES += vcd
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+  PRODUCT_PACKAGES += vcd
+endif