diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h
deleted file mode 100644
index 7dbe42533..000000000
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/components/activityindicator/ActivityIndicatorViewShadowNode.h>
-#include <react/core/ConcreteComponentDescriptor.h>
-
-namespace facebook {
-namespace react {
-
-using ActivityIndicatorViewComponentDescriptor =
-    ConcreteComponentDescriptor<ActivityIndicatorViewShadowNode>;
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp
deleted file mode 100644
index 6ff45aef6..000000000
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <react/components/activityindicator/ActivityIndicatorViewProps.h>
-#include <react/components/activityindicator/conversions.h>
-#include <react/core/propsConversions.h>
-
-namespace facebook {
-namespace react {
-
-ActivityIndicatorViewProps::ActivityIndicatorViewProps(
-    const ActivityIndicatorViewProps &sourceProps,
-    const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      animating(convertRawProp(rawProps, "animating", sourceProps.animating)),
-      color(convertRawProp(rawProps, "color", sourceProps.color)),
-      hidesWhenStopped(convertRawProp(
-          rawProps,
-          "hidesWhenStopped",
-          sourceProps.hidesWhenStopped)),
-      size(convertRawProp(rawProps, "size", sourceProps.size)) {}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h
deleted file mode 100644
index 8a8f7395b..000000000
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <react/components/activityindicator/primitives.h>
-#include <react/components/view/ViewProps.h>
-#include <react/graphics/Color.h>
-
-namespace facebook {
-namespace react {
-
-// TODO (T28334063): Consider for codegen.
-class ActivityIndicatorViewProps final : public ViewProps {
- public:
-  ActivityIndicatorViewProps() = default;
-  ActivityIndicatorViewProps(
-      const ActivityIndicatorViewProps &sourceProps,
-      const RawProps &rawProps);
-
-#pragma mark - Props
-
-  const bool animating{true};
-  const SharedColor color{colorFromComponents(
-      {153 / 255.0, 153 / 255.0, 153 / 255.0, 1.0})}; // #999999
-  const bool hidesWhenStopped{true};
-  const ActivityIndicatorViewSize size{ActivityIndicatorViewSize::Small};
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.cpp b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.cpp
deleted file mode 100644
index 09bb47000..000000000
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "ActivityIndicatorViewShadowNode.h"
-
-namespace facebook {
-namespace react {
-
-const char ActivityIndicatorViewComponentName[] = "ActivityIndicatorView";
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h
deleted file mode 100644
index ac768dd6d..000000000
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/components/activityindicator/ActivityIndicatorViewProps.h>
-#include <react/components/view/ConcreteViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-extern const char ActivityIndicatorViewComponentName[];
-
-/*
- * `ShadowNode` for <ActivityIndicatorView> component.
- */
-using ActivityIndicatorViewShadowNode = ConcreteViewShadowNode<
-    ActivityIndicatorViewComponentName,
-    ActivityIndicatorViewProps>;
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/primitives.h b/ReactCommon/fabric/components/activityindicator/primitives.h
deleted file mode 100644
index ba9b2606e..000000000
--- a/ReactCommon/fabric/components/activityindicator/primitives.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-namespace facebook {
-namespace react {
-
-enum class ActivityIndicatorViewSize {
-  Large,
-  Small,
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/fabric/components/activityindicator/tests/ActivityIndicatorViewTest.cpp b/ReactCommon/fabric/components/activityindicator/tests/ActivityIndicatorViewTest.cpp
deleted file mode 100644
index 05b6e147c..000000000
--- a/ReactCommon/fabric/components/activityindicator/tests/ActivityIndicatorViewTest.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <memory>
-
-#include <gtest/gtest.h>
-
-TEST(ActivityIndicatorViewTest, testSomething) {
-  // TODO
-}
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index 1b99a5e63..28f2ce82d 100644
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@@ -89,5 +89,6 @@ fb_xplat_cxx_test(
         react_native_xplat_target("fabric/components/scrollview:scrollview"),
         react_native_xplat_target("fabric/components/text:text"),
         react_native_xplat_target("fabric/components/view:view"),
+        "fbsource//xplat/js:generated_components-rncore",
     ],
 )
diff --git a/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp b/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp
index 10e53020e..f7c2efde7 100644
--- a/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp
+++ b/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp
@@ -13,8 +13,8 @@
 
 using namespace facebook::react;
 
-#include <react/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h>
 #include <react/components/image/ImageComponentDescriptor.h>
+#include <react/components/rncore/ComponentDescriptors.h>
 #include <react/components/scrollview/ScrollViewComponentDescriptor.h>
 #include <react/components/text/ParagraphComponentDescriptor.h>
 #include <react/components/text/RawTextComponentDescriptor.h>