diff --git a/patches/platform_build/0002-Move-ART-default-properties-into-system-partition.patch b/patches/platform_build/0002-Move-ART-default-properties-into-system-partition.patch
new file mode 100644
index 0000000..5695ad4
--- /dev/null
+++ b/patches/platform_build/0002-Move-ART-default-properties-into-system-partition.patch
@@ -0,0 +1,67 @@
+From 84e5d0e45c211c4e5e22acfea523ede244d34911 Mon Sep 17 00:00:00 2001
+From: Jaekyun Seok <jaekyun@google.com>
+Date: Fri, 3 Nov 2017 15:33:10 +0900
+Subject: [PATCH 2/3] Move ART default properties into system partition
+
+Bug: 64661857
+Bug: 68755013
+Test: confirmed that ART default properties were stored in
+/system/etc/prop.default on sailfish device
+
+Change-Id: Ie07d3049de5ac395cfb9105e208fe7825080fa15
+---
+ core/dex_preopt_libart.mk        | 4 +++-
+ target/product/runtime_libart.mk | 8 ++++----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
+index 96160367b..15cb221b6 100644
+--- a/core/dex_preopt_libart.mk
++++ b/core/dex_preopt_libart.mk
+@@ -30,7 +30,9 @@ DIRTY_IMAGE_OBJECTS := $(call word-colon,1,$(firstword \
+     $(filter %system/etc/dirty-image-objects,$(PRODUCT_COPY_FILES))))
+ 
+ define get-product-default-property
+-$(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))))
++$(strip \
++  $(eval _prop := $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))))\
++  $(if $(_prop),$(_prop),$(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_SYSTEM_DEFAULT_PROPERTIES)))))
+ endef
+ 
+ DEX2OAT_IMAGE_XMS := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xms)
+diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
+index 8aedee79c..f1b8f4596 100644
+--- a/target/product/runtime_libart.mk
++++ b/target/product/runtime_libart.mk
+@@ -56,7 +56,7 @@ PRODUCT_PACKAGES += art-tools
+ PRODUCT_PACKAGES += \
+     cacerts \
+ 
+-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
++PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+     dalvik.vm.image-dex2oat-Xms=64m \
+     dalvik.vm.image-dex2oat-Xmx=64m \
+     dalvik.vm.dex2oat-Xms=64m \
+@@ -70,16 +70,16 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+ # Different dexopt types for different package update/install times.
+ # On eng builds, make "boot" reasons only extract for faster turnaround.
+ ifeq (eng,$(TARGET_BUILD_VARIANT))
+-    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
++    PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+         pm.dexopt.first-boot=extract \
+         pm.dexopt.boot=extract
+ else
+-    PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
++    PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+         pm.dexopt.first-boot=quicken \
+         pm.dexopt.boot=verify
+ endif
+ 
+-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
++PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+     pm.dexopt.install=quicken \
+     pm.dexopt.bg-dexopt=speed-profile \
+     pm.dexopt.ab-ota=speed-profile \
+-- 
+2.15.1
+