diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk
index be014bfef..9bc7e0cc6 100644
--- a/target/board/BoardConfigMainlineCommon.mk
+++ b/target/board/BoardConfigMainlineCommon.mk
@@ -39,6 +39,9 @@ BOARD_CHARGER_ENABLE_SUSPEND := true
 # Enable system property split for Treble
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 
+# Include stats logging code in LMKD
+TARGET_LMKD_STATS_LOG := true
+
 # Generate an APEX image for experiment b/119800099.
 DEXPREOPT_GENERATE_APEX_IMAGE := true
 
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 72b43f932..1df7c003f 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -102,9 +102,6 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_HOST_PACKAGES += \
     tinyplay
 
-# Enable stats logging in LMKD
-TARGET_LMKD_STATS_LOG := true
-
 # Enable dynamic partition size
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true