diff --git a/config/partner_gms.mk b/config/partner_gms.mk
index 78aca8ea..273aaa68 100644
--- a/config/partner_gms.mk
+++ b/config/partner_gms.mk
@@ -1,4 +1,7 @@
 ifeq ($(WITH_GMS),true)
+ifeq ($(PRODUCT_IS_ATV),true)
+$(call inherit-product-if-exists, vendor/partner_gms-tv/products/gms.mk)
+else
 ifeq ($(WITH_GMS_FI),true)
 $(call inherit-product-if-exists, vendor/partner_gms/products/fi.mk)
 else
@@ -9,3 +12,4 @@ $(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk)
 endif
 endif
 endif
+endif