diff --git a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
index 766f7c5b3..e9b29db7c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
@@ -7,20 +7,21 @@
 
 package com.facebook.react;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.systrace.SystraceMessage;
-
-import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * React package supporting lazy creation of native modules.
@@ -36,7 +37,16 @@ public abstract class LazyReactPackage implements ReactPackage {
       reactModuleInfoProviderClass = Class.forName(
           lazyReactPackage.getClass().getCanonicalName() + "$$ReactModuleInfoProvider");
     } catch (ClassNotFoundException e) {
-      throw new RuntimeException(e);
+      // In OSS case, when the annotation processor does not run, we fall back to non-lazy mode
+      // For this, we simply return an empty moduleMap.
+      // NativeModuleRegistryBuilder will eagerly get all the modules, and get the info from the
+      // modules directly
+      return new ReactModuleInfoProvider() {
+        @Override
+        public Map<String, ReactModuleInfo> getReactModuleInfos() {
+          return Collections.emptyMap();
+        }
+      };
     }
 
     if (reactModuleInfoProviderClass == null) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
index 7550af230..bda163b5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
@@ -60,7 +60,7 @@ public class NativeModuleRegistryBuilder {
           NativeModule module;
           ReactMarker.logMarker(
             ReactMarkerConstants.CREATE_MODULE_START,
-            moduleSpec.getType().getName());
+            moduleSpec.getClassName());
           try {
             module = moduleSpec.getProvider().get();
           } finally {