fenix.patch

diff --git app/build.gradle app/build.gradle
index 468f18a2..55b70232 100644
--- app/build.gradle
+++ app/build.gradle
@@ -266,11 +266,7 @@ android.applicationVariants.all { variant ->
         buildConfigField 'boolean', 'CRASH_REPORTING', 'false'
     }
 
-    if (!isDebug) {
         buildConfigField 'boolean', 'TELEMETRY', 'true'
-    } else {
-        buildConfigField 'boolean', 'TELEMETRY', 'false'
-    }
 
     def buildDate = Config.generateBuildDate()
     buildConfigField 'String', 'BUILD_DATE', '"' + buildDate + '"'
@@ -575,7 +571,7 @@ def glean_android_components_tag = (
 // Generate markdown docs for the collected metrics.
 ext.gleanGenerateMarkdownDocs = true
 ext.gleanDocsDirectory = "$rootDir/docs"
-apply from: 'https://github.com/mozilla-mobile/android-components/raw/' + glean_android_components_tag + '/components/service/glean/scripts/sdk_generator.gradle'
+apply from: 'https://github.com/mozilla-mobile/android-components/raw/' + 'v16.0.0' + '/components/service/glean/scripts/sdk_generator.gradle'
 
 // For production builds, the native code for all `org.mozilla.appservices` dependencies gets compiled together
 // into a single "megazord" build, and different megazords are published for different subsets of features.
diff --git build.gradle build.gradle
index c3818f5e..bf35aeb2 100644
--- build.gradle
+++ build.gradle
@@ -38,6 +38,7 @@ allprojects {
             url "https://repo.leanplum.com/"
         }
         jcenter()
+        mavenLocal()
     }
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
         kotlinOptions.jvmTarget = "1.8"
diff --git buildSrc/src/main/java/Dependencies.kt buildSrc/src/main/java/Dependencies.kt
index 0c772b41..9fbbb632 100644
--- buildSrc/src/main/java/Dependencies.kt
+++ buildSrc/src/main/java/Dependencies.kt
@@ -35,7 +35,7 @@ object Versions {
     const val androidx_work = "2.0.1"
     const val google_material = "1.1.0-alpha10"
 
-    const val mozilla_android_components = "16.0.0"
+    const val mozilla_android_components = "18.0.0-TESTING"
     // Note that android-components also depends on application-services,
     // and in fact is our main source of appservices-related functionality.
     // The version number below tracks the application-services version