diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
index 9d115963423d1..c2d5b2f86002b 100644
--- a/services/core/java/com/android/server/pm/Installer.java
+++ b/services/core/java/com/android/server/pm/Installer.java
@@ -121,6 +121,24 @@ public class Installer extends SystemService {
         }
     }
 
+    @Override
+    public void onUnlockUser(int userId) {
+        if (userId == 0) {
+            if (!checkBeforeRemote()) return;
+
+            if (mInstalld == null) {
+                Slog.wtf(TAG, "Call to onUnlockUser prior to onStart.");
+                return;
+            }
+
+            try {
+                mInstalld.migrateLegacyObbData();
+            } catch (RemoteException re) {
+                Slog.wtf(TAG, "Error migrating legacy OBB data.", re);
+            }
+        }
+    }
+
     private void connect() {
         IBinder binder = ServiceManager.getService("installd");
         if (binder != null) {