--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -36,19 +36,25 @@ EXTRA_COMPONENTS += [
     'PresentationRequestUIGlue.js',
     'PromptService.js',
     'SessionStore.js',
     'Snippets.js',
     'TabSource.js',
     'XPIDialogService.js',
 ]
 
+if CONFIG['MOZ_ANDROID_MOZILLA_ONLINE']:
+    EXTRA_COMPONENTS += [
+        'CMManager.js',
+    ]
+
 # Keep it this way if at all possible.  If you need preprocessing,
 # consider adding fields to AppConstants.jsm.
 EXTRA_PP_COMPONENTS += [
     'MobileComponents.manifest',
 ]
 
 DIRS += [
     'extensions',
     'build',
     'geckoview',
 ]
+

--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -564,8 +564,12 @@
 @BINPATH@/chrome/marionette.manifest
 @BINPATH@/components/marionette.manifest
 @BINPATH@/components/marionette.js
 #endif
 
 #ifdef PKG_LOCALE_MANIFEST
 #include @PKG_LOCALE_MANIFEST@
 #endif
+
+#ifdef MOZ_ANDROID_MOZILLA_ONLINE
+@BINPATH@/components/CMManager.js
+#endif