diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index b2b1e775e94a8..38006dc5b943b 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -5920,6 +5920,10 @@ public final class ActivityThread extends ClientTransactionHandler {
                                                 UserHandle.myUserId());
         VMRuntime.setProcessPackageName(data.appInfo.packageName);
 
+        // Pass data directory path to ART. This is used for caching information and
+        // should be set before any application code is loaded.
+        VMRuntime.setProcessDataDirectory(data.appInfo.dataDir);
+
         if (mProfiler.profileFd != null) {
             mProfiler.startProfiling();
         }