--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -253,16 +253,17 @@ def wanted_mozconfig_variables(help):
          'DISABLE_SHARED_JS',
          'DOXYGEN',
          'DSYMUTIL',
          'EXTERNAL_SOURCE_DIR',
          'GENISOIMAGE',
          'L10NBASEDIR',
          'MOZILLABUILD',
          'MOZ_ANDROID_BEAM',
+         'MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
          'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
          'MOZ_ANDROID_EXCLUDE_FONTS',
          'MOZ_ANDROID_MLS_STUMBLER',
          'MOZ_ANDROID_SEARCH_ACTIVITY',
          'MOZ_ARTIFACT_BUILDS',
          'MOZ_BUILD_APP',
          'MOZ_CALLGRIND',
          'MOZ_DMD',

--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -84,13 +84,8 @@ fi
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
 
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
 MOZ_SWITCHBOARD=1
-
-# Enable DLC background service and stop shipping fonts in Nightly
-if test "$NIGHTLY_BUILD"; then
-  MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE=1
-fi

--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -1,14 +1,24 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+
+option(env='MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
+       help='Background service for downloading additional content at runtime.')
+
+@depends('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE', milestone)
+def download_content_service(value, milestone):
+    # Enable DLC background service in Nightly
+    if value or milestone.is_nightly:
+        set_define('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE', '1')
+
 option(env='MOZ_ANDROID_EXCLUDE_FONTS',
        help='Whether to exclude font files in the build')
 
 @depends('MOZ_ANDROID_EXCLUDE_FONTS', milestone)
 def exclude_fonts(value, milestone):
     # Stop shipping fonts in Nightly
     if value or milestone.is_nightly:
         set_config('MOZ_ANDROID_EXCLUDE_FONTS', '1')

--- a/old-configure.in
+++ b/old-configure.in
@@ -3783,23 +3783,16 @@ fi
 
 dnl =========================================================
 dnl = Whether to exclude hyphenations files in the build
 dnl =========================================================
 if test -n "$MOZ_EXCLUDE_HYPHENATION_DICTIONARIES"; then
     AC_DEFINE(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
 fi
 
-dnl =========================================================
-dnl = Background service for downloading additional content at runtime.
-dnl =========================================================
-if test -n "$MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE"; then
-    AC_DEFINE(MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE)
-fi
-
 dnl ========================================================
 dnl = Include install tracking on Android
 dnl ========================================================
 if test -n "$MOZ_INSTALL_TRACKING"; then
     AC_DEFINE(MOZ_INSTALL_TRACKING)
 fi
 
 dnl ========================================================
@@ -7278,17 +7271,16 @@ AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_GCM)
 AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
 AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)
 AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
 AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
-AC_SUBST(MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE)
 AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
 AC_SUBST(MOZ_INSTALL_TRACKING)
 AC_SUBST(MOZ_SWITCHBOARD)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
 AC_SUBST(USE_ELF_HACK)
 AC_SUBST(INCREMENTAL_LINKER)