diff --git a/src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java b/src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java
index d846ce0..d0ee180 100644
--- a/src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java
+++ b/src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java
@@ -34,6 +34,7 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
+import android.os.Process;
 import android.os.UserHandle;
 import android.permission.PermissionControllerService;
 import android.permission.PermissionManager;
@@ -569,6 +570,9 @@
         AsyncTask.execute(() -> {
             onGrantOrUpgradeDefaultRuntimePermissions();
             callback.run();
+
+            // Async part
+            Utils.updateUserSensitive(getApplication(), Process.myUserHandle());
         });
     }
 
diff --git a/src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java b/src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java
index 1ba0e0f..fde630b 100644
--- a/src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java
+++ b/src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java
@@ -29,7 +29,6 @@
 import androidx.annotation.WorkerThread;
 
 import com.android.packageinstaller.permission.utils.CollectionUtils;
-import com.android.packageinstaller.permission.utils.Utils;
 import com.android.packageinstaller.role.model.Role;
 import com.android.packageinstaller.role.model.Roles;
 import com.android.packageinstaller.role.utils.PackageUtils;
@@ -169,10 +168,6 @@
             }
         }
 
-        // Load data on this thread instead of background.
-        // TODO: Move out of this thread
-        Utils.updateUserSensitive(getApplication(), Process.myUserHandle());
-
         return true;
     }