Bug 1549886 - Enable MOZ_TELEMETRY_REPORTING by default when MOZILLA_OFFICIAL is set. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 08 May 2019 14:33:56 +0000
changeset 531960 07774a40d1f6ea04cbe74c17b7bbcb4d4f112e4c
parent 531959 db318bbb7517c815d85df318f955747dbdb8d698
child 531961 129dafe816e8bd27d75f0eb051f343871df5e744
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1549886
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1549886 - Enable MOZ_TELEMETRY_REPORTING by default when MOZILLA_OFFICIAL is set. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D30336
browser/config/mozconfigs/linux32/common-opt
browser/config/mozconfigs/linux32/debug
browser/config/mozconfigs/linux32/debug-asan
browser/config/mozconfigs/linux32/l10n-mozconfig
browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
browser/config/mozconfigs/linux32/nightly-asan
browser/config/mozconfigs/linux64-aarch64/common-opt
browser/config/mozconfigs/linux64/common-opt
browser/config/mozconfigs/linux64/debug
browser/config/mozconfigs/linux64/debug-asan
browser/config/mozconfigs/linux64/l10n-mozconfig
browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
browser/config/mozconfigs/linux64/nightly-asan
browser/config/mozconfigs/linux64/nightly-asan-reporter
browser/config/mozconfigs/macosx64/common-opt
browser/config/mozconfigs/macosx64/debug
browser/config/mozconfigs/macosx64/debug-asan
browser/config/mozconfigs/macosx64/l10n-mozconfig
browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
browser/config/mozconfigs/macosx64/nightly-asan
browser/config/mozconfigs/whitelist
browser/config/mozconfigs/win32/common-opt
browser/config/mozconfigs/win32/debug
browser/config/mozconfigs/win32/l10n-mozconfig
browser/config/mozconfigs/win32/l10n-mozconfig-devedition
browser/config/mozconfigs/win64-aarch64/common-opt
browser/config/mozconfigs/win64-aarch64/debug
browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
browser/config/mozconfigs/win64-aarch64/l10n-mozconfig-devedition
browser/config/mozconfigs/win64/code-coverage
browser/config/mozconfigs/win64/common-opt
browser/config/mozconfigs/win64/debug
browser/config/mozconfigs/win64/debug-asan
browser/config/mozconfigs/win64/debug-fuzzing
browser/config/mozconfigs/win64/l10n-mozconfig
browser/config/mozconfigs/win64/l10n-mozconfig-devedition
browser/config/mozconfigs/win64/nightly-asan
browser/config/mozconfigs/win64/nightly-asan-reporter
browser/config/mozconfigs/win64/nightly-fuzzing-asan
mobile/android/config/mozconfigs/android-aarch64/beta
mobile/android/config/mozconfigs/android-aarch64/debug
mobile/android/config/mozconfigs/android-aarch64/debug-beta
mobile/android/config/mozconfigs/android-aarch64/nightly
mobile/android/config/mozconfigs/android-api-16-frontend/nightly
mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
mobile/android/config/mozconfigs/android-api-16/beta
mobile/android/config/mozconfigs/android-api-16/debug
mobile/android/config/mozconfigs/android-api-16/debug-beta
mobile/android/config/mozconfigs/android-api-16/debug-searchfox
mobile/android/config/mozconfigs/android-api-16/nightly
mobile/android/config/mozconfigs/android-x86/beta
mobile/android/config/mozconfigs/android-x86/debug
mobile/android/config/mozconfigs/android-x86/debug-beta
mobile/android/config/mozconfigs/android-x86/debug-fuzzing
mobile/android/config/mozconfigs/android-x86/nightly
mobile/android/config/mozconfigs/android-x86_64/beta
mobile/android/config/mozconfigs/android-x86_64/debug
mobile/android/config/mozconfigs/android-x86_64/debug-beta
mobile/android/config/mozconfigs/android-x86_64/nightly
mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
toolkit/moz.configure
--- a/browser/config/mozconfigs/linux32/common-opt
+++ b/browser/config/mozconfigs/linux32/common-opt
@@ -7,12 +7,10 @@ ac_add_options --with-google-location-se
 ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/linux32/debug
+++ b/browser/config/mozconfigs/linux32/debug
@@ -4,19 +4,16 @@ ac_add_options --enable-debug
 
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 #Use ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux32/debug-asan
+++ b/browser/config/mozconfigs/linux32/debug-asan
@@ -6,18 +6,15 @@ ac_add_options --enable-optimize="-O1"
 . $topsrcdir/build/mozconfig.stylo
 
 # ASan specific options on Linux
 ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -7,16 +7,13 @@ ac_add_options --disable-nodejs
 
 if test `uname -m` = "x86_64"; then
   ac_add_options --target=i686-pc-linux
   ac_add_options --host=i686-pc-linux
 fi
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
@@ -7,18 +7,15 @@ ac_add_options --disable-nodejs
 
 if test `uname -m` = "x86_64"; then
   ac_add_options --target=i686-pc-linux
   ac_add_options --host=i686-pc-linux
 fi
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 # Enable MOZ_ALLOW_LEGACY_EXTENSIONS
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux32/nightly-asan
+++ b/browser/config/mozconfigs/linux32/nightly-asan
@@ -8,15 +8,12 @@ ac_add_options --enable-optimize="-O2 -g
 ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64-aarch64/common-opt
+++ b/browser/config/mozconfigs/linux64-aarch64/common-opt
@@ -10,14 +10,12 @@ ac_add_options --with-mozilla-api-keyfil
 . $topsrcdir/build/unix/mozconfig.linux
 
 unset NASM
 ac_add_options --target=aarch64
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 unset MOZ_STDCXX_COMPAT
--- a/browser/config/mozconfigs/linux64/common-opt
+++ b/browser/config/mozconfigs/linux64/common-opt
@@ -7,12 +7,10 @@ ac_add_options --with-google-location-se
 ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@@ -4,17 +4,14 @@ ac_add_options --enable-debug
 
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/debug-asan
+++ b/browser/config/mozconfigs/linux64/debug-asan
@@ -6,18 +6,15 @@ ac_add_options --enable-optimize="-O1"
 . $topsrcdir/build/mozconfig.stylo
 
 # ASan specific options on Linux
 ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -2,16 +2,13 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.no-compile"
 ac_add_options --disable-nodejs
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
@@ -2,19 +2,16 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
 
 . "$topsrcdir/build/mozconfig.no-compile"
 ac_add_options --disable-nodejs
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 # Enable MOZ_ALLOW_LEGACY_EXTENSIONS
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/nightly-asan
+++ b/browser/config/mozconfigs/linux64/nightly-asan
@@ -15,9 +15,12 @@ ac_add_options --disable-elf-hack
 ac_add_options --enable-undefined-sanitizer
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan
 
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/nightly-asan-reporter
+++ b/browser/config/mozconfigs/linux64/nightly-asan-reporter
@@ -17,15 +17,9 @@ ac_add_options --disable-elf-hack
 ac_add_options --enable-address-sanitizer-reporter
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan-reporter
 
 # Need this to add source information into platform.ini
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-# The channel reported by Telemetry here will be "nightly-asan" as specified
-# in the respective override pref (toolkit.telemetry.overrideUpdateChannel),
-# while the build otherwise identifies as "nightly" to receive its updates.
-export MOZ_TELEMETRY_REPORTING=1
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/common-opt
+++ b/browser/config/mozconfigs/macosx64/common-opt
@@ -5,12 +5,10 @@
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data
 ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -1,16 +1,13 @@
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/debug-asan
+++ b/browser/config/mozconfigs/macosx64/debug-asan
@@ -1,19 +1,16 @@
 # Use at least -O1 for optimization to avoid stack space
 # exhaustions caused by Clang function inlining.
 ac_add_options --enable-application=browser
 ac_add_options --enable-debug
 ac_add_options --enable-optimize="-O1"
 
 . $topsrcdir/build/unix/mozconfig.asan
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 # Before mozconfig.common so we can test for asan builds there
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/macosx/mozconfig.common"
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -13,16 +13,13 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
@@ -17,19 +17,16 @@ ac_add_options --disable-nodejs
 unset NODEJS
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 # Enable MOZ_ALLOW_LEGACY_EXTENSIONS
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/nightly-asan
+++ b/browser/config/mozconfigs/macosx64/nightly-asan
@@ -1,18 +1,15 @@
 ac_add_options --enable-application=browser
 # We still need to build with debug symbols
 ac_add_options --disable-debug
 ac_add_options --enable-optimize="-O2"
 
 . $topsrcdir/build/unix/mozconfig.asan
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 # Before mozconfig.common so we can test for asan builds there
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/macosx/mozconfig.common"
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -30,20 +30,18 @@ for platform in all_platforms:
         'ac_add_options --enable-official-branding',
         'export BUILDING_RELEASE=1',
     ]
 whitelist['release']['win32'] += ['export MOZ_PGO=1']
 whitelist['release']['win64'] += ['export MOZ_PGO=1']
 
 whitelist['release']['linux32'] += [
     'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
     'export MOZ_PGO=1',
 ]
 whitelist['release']['linux64'] += [
     'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
     '. "$topsrcdir/build/mozconfig.pgo"',
 ]
 
 if __name__ == '__main__':
     import pprint
     pprint.pprint(whitelist)
--- a/browser/config/mozconfigs/win32/common-opt
+++ b/browser/config/mozconfigs/win32/common-opt
@@ -9,14 +9,12 @@ ac_add_options --enable-update-channel=$
 ac_add_options --with-google-location-service-api-keyfile=${WORKSPACE}/gls-gapi.data
 ac_add_options --with-google-safebrowsing-api-keyfile=${WORKSPACE}/sb-gapi.data
 
 ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-api.key
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -4,19 +4,16 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -7,16 +7,13 @@ ac_add_options --enable-update-channel=$
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/nightly
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
@@ -7,19 +7,16 @@ ac_add_options --enable-update-channel=$
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/aurora
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 # Enable MOZ_ALLOW_LEGACY_EXTENSIONS
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64-aarch64/common-opt
+++ b/browser/config/mozconfigs/win64-aarch64/common-opt
@@ -9,18 +9,16 @@ ac_add_options --enable-update-channel=$
 ac_add_options --with-google-location-service-api-keyfile=${WORKSPACE}/gls-gapi.data
 ac_add_options --with-google-safebrowsing-api-keyfile=${WORKSPACE}/sb-gapi.data
 
 ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-api.key
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win64-aarch64/mozconfig.vs-latest
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 if test -n "$MOZ_ARTIFACT_TASK_WIN32_OPT"; then
   ac_add_options --enable-eme=widevine
 fi
--- a/browser/config/mozconfigs/win64-aarch64/debug
+++ b/browser/config/mozconfigs/win64-aarch64/debug
@@ -6,19 +6,16 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . $topsrcdir/build/win64-aarch64/mozconfig.vs-latest
 
 unset ENABLE_CLANG_PLUGIN
--- a/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
@@ -6,16 +6,13 @@ ac_add_options --enable-update-channel="
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/nightly
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig-devedition
@@ -6,19 +6,16 @@ ac_add_options --enable-update-channel="
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/aurora
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 # Enable MOZ_ALLOW_LEGACY_EXTENSIONS
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/code-coverage
+++ b/browser/config/mozconfigs/win64/code-coverage
@@ -8,19 +8,16 @@ ac_add_options --enable-debug
 ac_add_options --disable-sandbox
 ac_add_options --disable-warnings-as-errors
 ac_add_options --enable-coverage
 ac_add_options --enable-rust-tests
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 if [ -d "$topsrcdir/clang" ]; then
     CLANG_LIB_DIR="$(cd $topsrcdir/clang/lib/clang/* && cd lib/windows && pwd)"
 
--- a/browser/config/mozconfigs/win64/common-opt
+++ b/browser/config/mozconfigs/win64/common-opt
@@ -9,18 +9,16 @@ ac_add_options --enable-update-channel=$
 ac_add_options --with-google-location-service-api-keyfile=${WORKSPACE}/gls-gapi.data
 ac_add_options --with-google-safebrowsing-api-keyfile=${WORKSPACE}/sb-gapi.data
 
 ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-api.key
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 if [ -n "$MOZ_PGO" ]; then
     RUSTFLAGS="-Clinker-plugin-lto"
 fi
--- a/browser/config/mozconfigs/win64/debug
+++ b/browser/config/mozconfigs/win64/debug
@@ -5,19 +5,16 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/debug-asan
+++ b/browser/config/mozconfigs/win64/debug-asan
@@ -8,9 +8,12 @@ ac_add_options --enable-optimize="-O1"
 
 . "$topsrcdir/build/win64/mozconfig.vs-latest"
 
 . "$topsrcdir/build/win64/mozconfig.asan"
 
 export MOZ_PACKAGE_JSSHELL=1
 export MOZ_PKG_SPECIAL=asan
 
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/debug-fuzzing
+++ b/browser/config/mozconfigs/win64/debug-fuzzing
@@ -1,11 +1,11 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/debug"
 
 # Disable telemetry. All network activity is undesirable in fuzzing.
-unset MOZ_TELEMETRY_REPORTING
+ac_add_options MOZ_TELEMETRY_REPORTING=
 
 ac_add_options --enable-fuzzing
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=fuzzing
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig
@@ -6,16 +6,13 @@ ac_add_options --enable-update-channel=$
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/nightly
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
@@ -6,19 +6,16 @@ ac_add_options --enable-update-channel=$
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/aurora
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 # Enable MOZ_ALLOW_LEGACY_EXTENSIONS
 ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/nightly-asan
+++ b/browser/config/mozconfigs/win64/nightly-asan
@@ -8,9 +8,12 @@ ac_add_options --enable-optimize="-O2 -g
 
 . "$topsrcdir/build/win64/mozconfig.vs-latest"
 
 . "$topsrcdir/build/win64/mozconfig.asan"
 
 export MOZ_PACKAGE_JSSHELL=1
 export MOZ_PKG_SPECIAL=asan
 
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/nightly-asan-reporter
+++ b/browser/config/mozconfigs/win64/nightly-asan-reporter
@@ -19,15 +19,9 @@ ac_add_options --enable-address-sanitize
 export MOZ_PKG_SPECIAL=asan-reporter
 
 # Need this to add source information into platform.ini
 export MOZILLA_OFFICIAL=1
 
 # Sandboxing is currently not compatible with the way the ASan reporter works
 ac_add_options --disable-sandbox
 
-# Enable Telemetry
-# The channel reported by Telemetry here will be "nightly-asan" as specified
-# in the respective override pref (toolkit.telemetry.overrideUpdateChannel),
-# while the build otherwise identifies as "nightly" to receive its updates.
-export MOZ_TELEMETRY_REPORTING=1
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/nightly-fuzzing-asan
+++ b/browser/config/mozconfigs/win64/nightly-fuzzing-asan
@@ -1,12 +1,12 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/nightly-asan"
 
 # Disable telemetry
-unset MOZ_TELEMETRY_REPORTING
+ac_add_options MOZ_TELEMETRY_REPORTING=
 
 ac_add_options --disable-crashreporter
 
 ac_add_options --enable-fuzzing
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan-fuzzing
 
--- a/mobile/android/config/mozconfigs/android-aarch64/beta
+++ b/mobile/android/config/mozconfigs/android-aarch64/beta
@@ -8,12 +8,11 @@ ac_add_options --with-branding=mobile/an
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-aarch64/debug
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug
@@ -5,14 +5,13 @@ ac_add_options --enable-debug
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-aarch64/debug-beta
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug-beta
@@ -3,14 +3,13 @@
 # Global options
 ac_add_options --enable-debug
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-aarch64/nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/nightly
@@ -10,12 +10,11 @@ export FENNEC_NIGHTLY=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16-frontend/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-frontend/nightly
@@ -26,13 +26,12 @@ ac_add_options --disable-tests
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export FENNEC_NIGHTLY=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
@@ -31,17 +31,16 @@ ac_add_options --disable-tests
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export FENNEC_NIGHTLY=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
 
 # End ../android-api-16-frontend/nightly.
 
 # Disable Keyfile Loading (and checks) since dependency fetching doesn't need these keys.
--- a/mobile/android/config/mozconfigs/android-api-16/beta
+++ b/mobile/android/config/mozconfigs/android-api-16/beta
@@ -7,17 +7,16 @@
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/beta
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
--- a/mobile/android/config/mozconfigs/android-api-16/debug
+++ b/mobile/android/config/mozconfigs/android-api-16/debug
@@ -10,13 +10,12 @@ ac_add_options --enable-debug
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16/debug-beta
+++ b/mobile/android/config/mozconfigs/android-api-16/debug-beta
@@ -8,13 +8,12 @@ ac_add_options --enable-debug
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16/debug-searchfox
+++ b/mobile/android/config/mozconfigs/android-api-16/debug-searchfox
@@ -10,17 +10,16 @@ ac_add_options --enable-debug
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 # Save rust analysis (this requires unlocking the unstable features,
 # which is done in the taskcluster task definition via RUSTC_BOOTSTRAP)
 export RUSTFLAGS="-Zsave-analysis"
 ac_add_options --enable-mozsearch-plugin
 
--- a/mobile/android/config/mozconfigs/android-api-16/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16/nightly
@@ -9,17 +9,16 @@
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
--- a/mobile/android/config/mozconfigs/android-x86/beta
+++ b/mobile/android/config/mozconfigs/android-x86/beta
@@ -6,17 +6,16 @@
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
 ac_add_options --with-branding=mobile/android/branding/beta
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -10,14 +10,13 @@ ac_add_options --enable-debug
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/debug-beta
+++ b/mobile/android/config/mozconfigs/android-x86/debug-beta
@@ -8,14 +8,13 @@ ac_add_options --enable-debug
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/debug-fuzzing
+++ b/mobile/android/config/mozconfigs/android-x86/debug-fuzzing
@@ -1,12 +1,14 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/android-x86/debug"
 
 # Remove unwanted environment variables from the 'debug' mozconfig.
-unset MOZ_TELEMETRY_REPORTING
 unset MOZ_ANDROID_POCKET
 
+# Disable Telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
 ac_add_options --enable-fuzzing
 
 # This adds '-fuzzing' to the APK filename for local builds.
 export MOZ_PKG_SPECIAL=fuzzing
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -8,17 +8,16 @@
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
--- a/mobile/android/config/mozconfigs/android-x86_64/beta
+++ b/mobile/android/config/mozconfigs/android-x86_64/beta
@@ -8,12 +8,11 @@ ac_add_options --with-branding=mobile/an
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86_64/debug
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug
@@ -5,14 +5,13 @@ ac_add_options --enable-debug
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86_64/debug-beta
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-beta
@@ -3,14 +3,13 @@
 # Global options
 ac_add_options --enable-debug
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86_64/nightly
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly
@@ -10,12 +10,11 @@ export FENNEC_NIGHTLY=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
+++ b/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
@@ -12,11 +12,10 @@ ac_add_options --enable-profiling
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 ac_add_options --with-android-distribution-directory=/builds/worker/workspace/build/partner
 
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -636,17 +636,17 @@ set_config('MOZ_ALLOW_LEGACY_EXTENSIONS'
 set_define('MOZ_ALLOW_LEGACY_EXTENSIONS', legacy_extensions)
 
 @depends('MOZ_PLACES', 'MOZ_ANDROID_HISTORY')
 def check_places_and_android_history(places, android_history):
     if places and android_history:
         die('Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.')
 
 
-option(env='MOZ_TELEMETRY_REPORTING',
+option(env='MOZ_TELEMETRY_REPORTING', default=mozilla_official,
        help='Enable telemetry reporting')
 
 set_define('MOZ_TELEMETRY_REPORTING', True, when='MOZ_TELEMETRY_REPORTING')
 add_old_configure_assignment(
     'MOZ_TELEMETRY_REPORTING', True, when='MOZ_TELEMETRY_REPORTING')
 
 
 @depends('MOZ_TELEMETRY_REPORTING', milestone.is_nightly, fennec_nightly)