diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 91d5d26c4b..009ca529cc 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -139,7 +139,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     pm.dexopt.ab-ota=speed-profile \
     pm.dexopt.nsys-library=speed \
     pm.dexopt.shared-apk=speed \
-    pm.dexopt.forced-dexopt=speed
+    pm.dexopt.forced-dexopt=speed \
+    pm.dexopt.core-app=speed
+
 
 # Enable boot.oat filtering of compiled classes to reduce boot.oat size. b/28026683
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 11a66eb078..ec2fa41d11 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -129,7 +129,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     pm.dexopt.ab-ota=speed-profile \
     pm.dexopt.nsys-library=speed \
     pm.dexopt.shared-apk=speed \
-    pm.dexopt.forced-dexopt=speed
+    pm.dexopt.forced-dexopt=speed \
+    pm.dexopt.core-app=speed
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)