diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
index a1690828a4df9..370cf48b46555 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
@@ -101,7 +101,7 @@ class Owners {
 
     public Owners(Context context) {
         mContext = context;
-        mUserManager = UserManager.get(mContext);
+        mUserManager = context.getSystemService(UserManager.class);
     }
 
     /**
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
index f3d91600251e0..3b30a37bd2c02 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
@@ -218,6 +218,11 @@ public class DpmMockContext extends MockContext {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public String getSystemServiceName(Class<?> serviceClass) {
+        return realTestContext.getSystemServiceName(serviceClass);
+    }
+
     @Override
     public PackageManager getPackageManager() {
         return packageManager;