diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2f02539435..93e9d8b183 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -150,3 +150,13 @@ baselineProfile {
 dependencyGuard {
     configuration("prodReleaseRuntimeClasspath")
 }
+
+val benchmarksProject = rootProject.findProject(":benchmarks")
+if (benchmarksProject != null) {
+    tasks.matching { it.name == "createProdNonMinifiedReleaseApkListingFileRedirect" }
+        .configureEach {
+            dependsOn(benchmarksProject.tasks.matching {
+                it.name.contains("packageProdNonMinifiedRelease")
+            })
+        }
+}
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 258993913f..67b053ec62 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -26,7 +26,7 @@ android {
     defaultConfig {
         minSdk = 28
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
+        testInstrumentationRunnerArguments["androidx.benchmark.enabledRules"] = "BaselineProfile"
         buildConfigField("String", "APP_BUILD_TYPE_SUFFIX", "\"\"")
     }