diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt
index df5724d8083..bb03454ac27 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt
@@ -95,7 +95,7 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory {
       redBoxHandler: RedBoxHandler?,
       devBundleDownloadListener: DevBundleDownloadListener?,
       minNumShakes: Int,
-      customPackagerCommandHandlers: MutableMap<String, RequestHandler>?,
+      customPackagerCommandHandlers: Map<String, RequestHandler>?,
       surfaceDelegateFactory: SurfaceDelegateFactory?,
       devLoadingViewManager: DevLoadingViewManager?,
       pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?,
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
deleted file mode 100644
index 29d9f7e3053..00000000000
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.devsupport;
-
-import android.content.Context;
-import androidx.annotation.Nullable;
-import com.facebook.react.common.SurfaceDelegateFactory;
-import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
-import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
-import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
-import com.facebook.react.devsupport.interfaces.RedBoxHandler;
-import com.facebook.react.packagerconnection.RequestHandler;
-import java.util.Map;
-
-public interface DevSupportManagerFactory {
-  /**
-   * Factory used by the Old Architecture flow to create a {@link DevSupportManager} and a {@link
-   * com.facebook.react.runtime.BridgeDevSupportManager}
-   */
-  DevSupportManager create(
-      Context applicationContext,
-      ReactInstanceDevHelper reactInstanceManagerHelper,
-      @Nullable String packagerPathForJSBundleName,
-      boolean enableOnCreate,
-      @Nullable RedBoxHandler redBoxHandler,
-      @Nullable DevBundleDownloadListener devBundleDownloadListener,
-      int minNumShakes,
-      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
-      @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
-      @Nullable DevLoadingViewManager devLoadingViewManager,
-      @Nullable PausedInDebuggerOverlayManager pausedInDebuggerOverlayManager);
-
-  /**
-   * Factory used by the New Architecture/Bridgeless flow to create a {@link DevSupportManager} and
-   * a {@link BridgelessDevSupportManager}
-   */
-  DevSupportManager create(
-      Context applicationContext,
-      ReactInstanceDevHelper reactInstanceManagerHelper,
-      @Nullable String packagerPathForJSBundleName,
-      boolean enableOnCreate,
-      @Nullable RedBoxHandler redBoxHandler,
-      @Nullable DevBundleDownloadListener devBundleDownloadListener,
-      int minNumShakes,
-      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
-      @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
-      @Nullable DevLoadingViewManager devLoadingViewManager,
-      @Nullable PausedInDebuggerOverlayManager pausedInDebuggerOverlayManager,
-      boolean useDevSupport);
-}
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.kt
new file mode 100644
index 00000000000..c006de2d7ba
--- /dev/null
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport
+
+import android.content.Context
+import com.facebook.react.common.SurfaceDelegateFactory
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
+import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
+import com.facebook.react.devsupport.interfaces.DevSupportManager
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
+import com.facebook.react.devsupport.interfaces.RedBoxHandler
+import com.facebook.react.packagerconnection.RequestHandler
+
+public interface DevSupportManagerFactory {
+
+  /**
+   * Factory used by the Old Architecture flow to create a [DevSupportManager] and a
+   * [BridgeDevSupportManager]
+   */
+  public fun create(
+      applicationContext: Context,
+      reactInstanceManagerHelper: ReactInstanceDevHelper,
+      packagerPathForJSBundleName: String?,
+      enableOnCreate: Boolean,
+      redBoxHandler: RedBoxHandler?,
+      devBundleDownloadListener: DevBundleDownloadListener?,
+      minNumShakes: Int,
+      customPackagerCommandHandlers: Map<String, RequestHandler>?,
+      surfaceDelegateFactory: SurfaceDelegateFactory?,
+      devLoadingViewManager: DevLoadingViewManager?,
+      pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?
+  ): DevSupportManager
+
+  /**
+   * Factory used by the New Architecture/Bridgeless flow to create a [DevSupportManager] and a
+   * [BridgelessDevSupportManager]
+   */
+  public fun create(
+      applicationContext: Context,
+      reactInstanceManagerHelper: ReactInstanceDevHelper,
+      packagerPathForJSBundleName: String?,
+      enableOnCreate: Boolean,
+      redBoxHandler: RedBoxHandler?,
+      devBundleDownloadListener: DevBundleDownloadListener?,
+      minNumShakes: Int,
+      customPackagerCommandHandlers: Map<String, RequestHandler>?,
+      surfaceDelegateFactory: SurfaceDelegateFactory?,
+      devLoadingViewManager: DevLoadingViewManager?,
+      pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?,
+      useDevSupport: Boolean
+  ): DevSupportManager
+}