diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
index 1a1cc072c6bf8..19b0ea1db04e5 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
@@ -33,9 +33,6 @@ import java.io.PrintWriter;
 
 import javax.inject.Inject;
 
-import dagger.Reusable;
-
-@Reusable  // Don't create multiple DozeServices.
 public class DozeService extends DreamService
         implements DozeMachine.Service, RequestDoze, PluginListener<DozeServicePlugin> {
     private static final String TAG = "DozeService";
@@ -60,7 +57,7 @@ public class DozeService extends DreamService
         setWindowless(true);
 
         mPluginManager.addPluginListener(this, DozeServicePlugin.class, false /* allowMultiple */);
-        DozeComponent dozeComponent = mDozeComponentBuilder.build();
+        DozeComponent dozeComponent = mDozeComponentBuilder.build(this);
         mDozeMachine = dozeComponent.getDozeMachine();
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeComponent.java b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeComponent.java
index 247285434df9a..05050f905e606 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeComponent.java
@@ -19,6 +19,7 @@ package com.android.systemui.doze.dagger;
 import com.android.systemui.doze.DozeMachine;
 import com.android.systemui.doze.DozeService;
 
+import dagger.BindsInstance;
 import dagger.Subcomponent;
 
 /**
@@ -30,7 +31,7 @@ public interface DozeComponent {
     /** Simple Builder for {@link DozeComponent}. */
     @Subcomponent.Factory
     interface Builder {
-        DozeComponent build();
+        DozeComponent build(@BindsInstance DozeMachine.Service dozeMachineService);
     }
 
     /** Supply a {@link DozeMachine}. */
diff --git a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
index a12e280fcca6b..04f7c368fdc42 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
@@ -33,7 +33,6 @@ import com.android.systemui.doze.DozeScreenBrightness;
 import com.android.systemui.doze.DozeScreenState;
 import com.android.systemui.doze.DozeScreenStatePreventingAdapter;
 import com.android.systemui.doze.DozeSensors;
-import com.android.systemui.doze.DozeService;
 import com.android.systemui.doze.DozeSuspendScreenStatePreventingAdapter;
 import com.android.systemui.doze.DozeTriggers;
 import com.android.systemui.doze.DozeUi;
@@ -52,9 +51,9 @@ public abstract class DozeModule {
     @Provides
     @DozeScope
     @WrappedService
-    static DozeMachine.Service providesWrappedService(DozeService dozeService, DozeHost dozeHost,
-            DozeParameters dozeParameters) {
-        DozeMachine.Service wrappedService = dozeService;
+    static DozeMachine.Service providesWrappedService(DozeMachine.Service dozeMachineService,
+            DozeHost dozeHost, DozeParameters dozeParameters) {
+        DozeMachine.Service wrappedService = dozeMachineService;
         wrappedService = new DozeBrightnessHostForwarder(wrappedService, dozeHost);
         wrappedService = DozeScreenStatePreventingAdapter.wrapIfNeeded(
                 wrappedService, dozeParameters);