--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -409,25 +409,27 @@ pref("browser.ui.zoom.force-user-scalabl
 // When removing this Nightly flag, also remember to remove the flags surrounding this feature
 // in GeckoPreferences and BrowserApp (see bug 1245930).
 #ifdef NIGHTLY_BUILD
 pref("ui.bookmark.mobilefolder.enabled", true);
 #else
 pref("ui.bookmark.mobilefolder.enabled", false);
 #endif
 
-#if MOZ_UPDATE_CHANNEL == nightly
-pref("mma.enabled", true);
-#elif MOZ_UPDATE_CHANNEL == beta
+#ifdef RELEASE_OR_BETA
+// disable beta and release
+pref("mma.enabled", false);
+#elif MOZ_UPDATE_CHANNEL == nightly
+// for nightly
 pref("mma.enabled", true);
 #else
+// for local build
 pref("mma.enabled", true);
 #endif
 
-
 pref("ui.touch.radius.enabled", false);
 pref("ui.touch.radius.leftmm", 3);
 pref("ui.touch.radius.topmm", 5);
 pref("ui.touch.radius.rightmm", 3);
 pref("ui.touch.radius.bottommm", 2);
 pref("ui.touch.radius.visitedWeight", 120);
 
 pref("ui.mouse.radius.enabled", false);

--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -63,21 +63,17 @@ elif test "$MOZ_UPDATE_CHANNEL" = "beta"
     ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk-beta.token
 else
     ac_add_options --with-adjust-sdk-keyfile="$topsrcdir/mobile/android/base/adjust-sdk-sandbox.token"
 fi
 
 # MOZ_ANDROID_MMA depends on --with-leanplum-sdk-keyfile, and there's no default
 # keyfile set, so if we misconfigure beta or release, the builds will fail (at
 # configure time).
-if test "$MOZ_UPDATE_CHANNEL" = "release" ; then
-    ac_add_options --with-leanplum-sdk-keyfile=/builds/leanplum-sdk-release.token
-elif test "$MOZ_UPDATE_CHANNEL" = "beta" ; then
-    ac_add_options --with-leanplum-sdk-keyfile=/builds/leanplum-sdk-beta.token
-elif test "$MOZ_UPDATE_CHANNEL" = "nightly" ; then
+if test "$MOZ_UPDATE_CHANNEL" = "nightly" ; then
     ac_add_options --with-leanplum-sdk-keyfile=/builds/leanplum-sdk-nightly.token
 else
     ac_add_options --with-leanplum-sdk-keyfile="$topsrcdir/mobile/android/base/leanplum-sdk-sandbox.token"
 fi
 
 export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
 
 # Package js shell.