diff --git a/aosp_common.mk b/aosp_common.mk
index 87243925..a45fd74d 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -34,7 +34,10 @@ endif
 #
 # All components inherited here go to product image
 #
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk)
+endif
 
 #
 # All components inherited here go to vendor image