diff --git a/core/product.mk b/core/product.mk
index 5f1e14515f..4c254bffb2 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -40,7 +40,6 @@ _product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN
 _product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE
 _product_list_vars += PRODUCT_PACKAGES_ENG
 _product_list_vars += PRODUCT_PACKAGES_TESTS
-_product_list_vars += PRODUCT_AFDO_PROFILES
 
 # The device that this product maps to.
 _product_single_value_vars += PRODUCT_DEVICE
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 6348cf0457..a3961f9ed6 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -12,6 +12,8 @@ endif
 include $(BUILD_SYSTEM)/art_config.mk
 include $(BUILD_SYSTEM)/dex_preopt_config.mk
 
+-include vendor/google_data/pgo_profile/sampling/afdo_profiles.mk
+
 ifeq ($(WRITE_SOONG_VARIABLES),true)
 
 # Create soong.variables with copies of makefile settings.  Runs every build,