diff --git a/core/envsetup.mk b/core/envsetup.mk
index 2a97acfad..7dd19cf40 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -261,6 +261,7 @@ endef
 ART_APEX_JARS := \
     com.android.art:core-oj \
     com.android.art:core-libart \
+    com.android.art:core-icu4j \
     com.android.art:okhttp \
     com.android.art:bouncycastle \
     com.android.art:apache-xml
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5c88ae854..3e5d3a322 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -320,7 +320,6 @@ PRODUCT_BOOT_JARS := \
     $(ART_APEX_JARS) \
     framework-minus-apex \
     ext \
-    com.android.i18n:core-icu4j \
     telephony-common \
     voip-common \
     ims-common \