diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index 13264a9..64ec14d 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -462,14 +462,14 @@
      */
     private void syncEntriesFromPrimaryUser(UserManager userManager) {
         final int userHandle = userManager.getUserHandle();
-        if (userHandle == UserHandle.USER_OWNER
-                || userManager.getUserInfo(userHandle).isManagedProfile()) {
+        // TODO: http://b/24944959
+        if (userManager.isSameProfileGroup(UserHandle.USER_SYSTEM, userHandle)) {
             return;
         }
 
         final long lastSyncTime = getLastSyncTime();
         final Uri uri = ContentProvider.maybeAddUserId(CallLog.Calls.CONTENT_URI,
-                UserHandle.USER_OWNER);
+                UserHandle.USER_SYSTEM);
         final Cursor cursor = getContext().getContentResolver().query(
                 uri,
                 CALL_LOG_SYNC_PROJECTION,
