diff --git a/tests/FlickerTests/ActivityEmbedding/Android.bp b/tests/FlickerTests/ActivityEmbedding/Android.bp
index 9eeec7c..2cdf542 100644
--- a/tests/FlickerTests/ActivityEmbedding/Android.bp
+++ b/tests/FlickerTests/ActivityEmbedding/Android.bp
@@ -29,6 +29,8 @@
     manifest: "AndroidManifest.xml",
     package_name: "com.android.server.wm.flicker",
     instrumentation_target_package: "com.android.server.wm.flicker",
+    test_config_template: "AndroidTestTemplate.xml",
     srcs: ["src/**/*"],
     static_libs: ["FlickerTestsBase"],
+    data: ["trace_config/*"],
 }
diff --git a/tests/FlickerTests/ActivityEmbedding/AndroidManifest.xml b/tests/FlickerTests/ActivityEmbedding/AndroidManifest.xml
index f867ffb..6f8f008 100644
--- a/tests/FlickerTests/ActivityEmbedding/AndroidManifest.xml
+++ b/tests/FlickerTests/ActivityEmbedding/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="com.android.server.wm.flick">
+          package="com.android.server.wm.flicker">
 
     <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
     <!-- Read and write traces from external storage -->
diff --git a/tests/FlickerTests/ActivityEmbedding/trace_config/trace_config.textproto b/tests/FlickerTests/ActivityEmbedding/trace_config/trace_config.textproto
index c9a35ac..c4edc1a 100644
--- a/tests/FlickerTests/ActivityEmbedding/trace_config/trace_config.textproto
+++ b/tests/FlickerTests/ActivityEmbedding/trace_config/trace_config.textproto
@@ -62,12 +62,6 @@
       atrace_categories: "binder_driver"
       atrace_categories: "sched_process_exit"
       atrace_apps: "com.android.server.wm.flicker"
-      atrace_apps: "com.android.server.wm.flicker.other"
-      atrace_apps: "com.android.server.wm.flicker.close"
-      atrace_apps: "com.android.server.wm.flicker.ime"
-      atrace_apps: "com.android.server.wm.flicker.launch"
-      atrace_apps: "com.android.server.wm.flicker.quickswitch"
-      atrace_apps: "com.android.server.wm.flicker.rotation"
       atrace_apps: "com.android.server.wm.flicker.testapp"
       atrace_apps: "com.android.systemui"
       atrace_apps: "com.google.android.apps.nexuslauncher"
diff --git a/tests/FlickerTests/Android.bp b/tests/FlickerTests/Android.bp
index 514f895..1d71f95 100644
--- a/tests/FlickerTests/Android.bp
+++ b/tests/FlickerTests/Android.bp
@@ -23,13 +23,6 @@
     default_applicable_licenses: ["frameworks_base_license"],
 }
 
-filegroup {
-    name: "FlickerServiceTests-src",
-    srcs: [
-        "src/**/*",
-    ],
-}
-
 java_defaults {
     name: "FlickerTestsDefault",
     platform_apis: true,
@@ -49,10 +42,7 @@
         "wm-flicker-common-app-helpers",
         "wm-shell-flicker-utils",
     ],
-    data: [
-        ":FlickerTestApp",
-        "trace_config/*",
-    ],
+    data: [":FlickerTestApp"],
 }
 
 java_library {
diff --git a/tests/FlickerTests/AppClose/Android.bp b/tests/FlickerTests/AppClose/Android.bp
index 151d12f..93fdd65 100644
--- a/tests/FlickerTests/AppClose/Android.bp
+++ b/tests/FlickerTests/AppClose/Android.bp
@@ -30,4 +30,5 @@
     test_config_template: "AndroidTestTemplate.xml",
     srcs: ["src/**/*"],
     static_libs: ["FlickerTestsBase"],
+    data: ["trace_config/*"],
 }
diff --git a/tests/FlickerTests/AppClose/trace_config/trace_config.textproto b/tests/FlickerTests/AppClose/trace_config/trace_config.textproto
index c9a35ac..6a0afc6 100644
--- a/tests/FlickerTests/AppClose/trace_config/trace_config.textproto
+++ b/tests/FlickerTests/AppClose/trace_config/trace_config.textproto
@@ -61,13 +61,7 @@
       atrace_categories: "input"
       atrace_categories: "binder_driver"
       atrace_categories: "sched_process_exit"
-      atrace_apps: "com.android.server.wm.flicker"
-      atrace_apps: "com.android.server.wm.flicker.other"
       atrace_apps: "com.android.server.wm.flicker.close"
-      atrace_apps: "com.android.server.wm.flicker.ime"
-      atrace_apps: "com.android.server.wm.flicker.launch"
-      atrace_apps: "com.android.server.wm.flicker.quickswitch"
-      atrace_apps: "com.android.server.wm.flicker.rotation"
       atrace_apps: "com.android.server.wm.flicker.testapp"
       atrace_apps: "com.android.systemui"
       atrace_apps: "com.google.android.apps.nexuslauncher"
diff --git a/tests/FlickerTests/AppLaunch/Android.bp b/tests/FlickerTests/AppLaunch/Android.bp
index f33384d..f5e9621 100644
--- a/tests/FlickerTests/AppLaunch/Android.bp
+++ b/tests/FlickerTests/AppLaunch/Android.bp
@@ -50,6 +50,7 @@
         "FlickerTestsBase",
         "FlickerTestsAppLaunchCommon",
     ],
+    data: ["trace_config/*"],
 }
 
 android_test {
@@ -66,4 +67,5 @@
         "FlickerTestsBase",
         "FlickerTestsAppLaunchCommon",
     ],
+    data: ["trace_config/*"],
 }
diff --git a/tests/FlickerTests/AppLaunch/trace_config/trace_config.textproto b/tests/FlickerTests/AppLaunch/trace_config/trace_config.textproto
index c9a35ac..f27177f 100644
--- a/tests/FlickerTests/AppLaunch/trace_config/trace_config.textproto
+++ b/tests/FlickerTests/AppLaunch/trace_config/trace_config.textproto
@@ -61,13 +61,7 @@
       atrace_categories: "input"
       atrace_categories: "binder_driver"
       atrace_categories: "sched_process_exit"
-      atrace_apps: "com.android.server.wm.flicker"
-      atrace_apps: "com.android.server.wm.flicker.other"
-      atrace_apps: "com.android.server.wm.flicker.close"
-      atrace_apps: "com.android.server.wm.flicker.ime"
       atrace_apps: "com.android.server.wm.flicker.launch"
-      atrace_apps: "com.android.server.wm.flicker.quickswitch"
-      atrace_apps: "com.android.server.wm.flicker.rotation"
       atrace_apps: "com.android.server.wm.flicker.testapp"
       atrace_apps: "com.android.systemui"
       atrace_apps: "com.google.android.apps.nexuslauncher"
diff --git a/tests/FlickerTests/FlickerService/Android.bp b/tests/FlickerTests/FlickerService/Android.bp
index 1a38115..ef74e94 100644
--- a/tests/FlickerTests/FlickerService/Android.bp
+++ b/tests/FlickerTests/FlickerService/Android.bp
@@ -30,4 +30,5 @@
     test_config_template: "AndroidTestTemplate.xml",
     srcs: ["src/**/*"],
     static_libs: ["FlickerTestsBase"],
+    data: ["trace_config/*"],
 }
diff --git a/tests/FlickerTests/FlickerService/trace_config/trace_config.textproto b/tests/FlickerTests/FlickerService/trace_config/trace_config.textproto
index c9a35ac..a4f3ecf 100644
--- a/tests/FlickerTests/FlickerService/trace_config/trace_config.textproto
+++ b/tests/FlickerTests/FlickerService/trace_config/trace_config.textproto
@@ -61,13 +61,7 @@
       atrace_categories: "input"
       atrace_categories: "binder_driver"
       atrace_categories: "sched_process_exit"
-      atrace_apps: "com.android.server.wm.flicker"
-      atrace_apps: "com.android.server.wm.flicker.other"
-      atrace_apps: "com.android.server.wm.flicker.close"
-      atrace_apps: "com.android.server.wm.flicker.ime"
-      atrace_apps: "com.android.server.wm.flicker.launch"
-      atrace_apps: "com.android.server.wm.flicker.quickswitch"
-      atrace_apps: "com.android.server.wm.flicker.rotation"
+      atrace_apps: "com.android.server.wm.flicker.service"
       atrace_apps: "com.android.server.wm.flicker.testapp"
       atrace_apps: "com.android.systemui"
       atrace_apps: "com.google.android.apps.nexuslauncher"
diff --git a/tests/FlickerTests/IME/Android.bp b/tests/FlickerTests/IME/Android.bp
index 057d9fc..1141e5f 100644
--- a/tests/FlickerTests/IME/Android.bp
+++ b/tests/FlickerTests/IME/Android.bp
@@ -40,6 +40,7 @@
     test_config_template: "AndroidTestTemplate.xml",
     srcs: ["src/**/*"],
     static_libs: ["FlickerTestsBase"],
+    data: ["trace_config/*"],
 }
 
 java_library {
@@ -59,6 +60,7 @@
         "FlickerTestsBase",
         "FlickerTestsImeCommon",
     ],
+    data: ["trace_config/*"],
 }
 
 android_test {
@@ -75,4 +77,5 @@
         "FlickerTestsBase",
         "FlickerTestsImeCommon",
     ],
+    data: ["trace_config/*"],
 }
diff --git a/tests/FlickerTests/IME/trace_config/trace_config.textproto b/tests/FlickerTests/IME/trace_config/trace_config.textproto
index c9a35ac..b722fe5 100644
--- a/tests/FlickerTests/IME/trace_config/trace_config.textproto
+++ b/tests/FlickerTests/IME/trace_config/trace_config.textproto
@@ -61,13 +61,7 @@
       atrace_categories: "input"
       atrace_categories: "binder_driver"
       atrace_categories: "sched_process_exit"
-      atrace_apps: "com.android.server.wm.flicker"
-      atrace_apps: "com.android.server.wm.flicker.other"
-      atrace_apps: "com.android.server.wm.flicker.close"
       atrace_apps: "com.android.server.wm.flicker.ime"
-      atrace_apps: "com.android.server.wm.flicker.launch"
-      atrace_apps: "com.android.server.wm.flicker.quickswitch"
-      atrace_apps: "com.android.server.wm.flicker.rotation"
       atrace_apps: "com.android.server.wm.flicker.testapp"
       atrace_apps: "com.android.systemui"
       atrace_apps: "com.google.android.apps.nexuslauncher"
diff --git a/tests/FlickerTests/Notification/Android.bp b/tests/FlickerTests/Notification/Android.bp
index 5bed568..4648383 100644
--- a/tests/FlickerTests/Notification/Android.bp
+++ b/tests/FlickerTests/Notification/Android.bp
@@ -30,4 +30,5 @@
     test_config_template: "AndroidTestTemplate.xml",
     srcs: ["src/**/*"],
     static_libs: ["FlickerTestsBase"],
+    data: ["trace_config/*"],
 }
diff --git a/tests/FlickerTests/Notification/trace_config/trace_config.textproto b/tests/FlickerTests/Notification/trace_config/trace_config.textproto
index c9a35ac..dc8c88c 100644
--- a/tests/FlickerTests/Notification/trace_config/trace_config.textproto
+++ b/tests/FlickerTests/Notification/trace_config/trace_config.textproto
@@ -61,13 +61,7 @@
       atrace_categories: "input"
       atrace_categories: "binder_driver"
       atrace_categories: "sched_process_exit"
-      atrace_apps: "com.android.server.wm.flicker"
-      atrace_apps: "com.android.server.wm.flicker.other"
-      atrace_apps: "com.android.server.wm.flicker.close"
-      atrace_apps: "com.android.server.wm.flicker.ime"
-      atrace_apps: "com.android.server.wm.flicker.launch"
-      atrace_apps: "com.android.server.wm.flicker.quickswitch"
-      atrace_apps: "com.android.server.wm.flicker.rotation"
+      atrace_apps: "com.android.server.wm.flicker.notification"
       atrace_apps: "com.android.server.wm.flicker.testapp"
       atrace_apps: "com.android.systemui"
       atrace_apps: "com.google.android.apps.nexuslauncher"
diff --git a/tests/FlickerTests/QuickSwitch/Android.bp b/tests/FlickerTests/QuickSwitch/Android.bp
index 64f7183..8755d0e 100644
--- a/tests/FlickerTests/QuickSwitch/Android.bp
+++ b/tests/FlickerTests/QuickSwitch/Android.bp
@@ -30,4 +30,5 @@
     test_config_template: "AndroidTestTemplate.xml",
     srcs: ["src/**/*"],
     static_libs: ["FlickerTestsBase"],
+    data: ["trace_config/*"],
 }
diff --git a/tests/FlickerTests/QuickSwitch/trace_config/trace_config.textproto b/tests/FlickerTests/QuickSwitch/trace_config/trace_config.textproto
index c9a35ac..cd70ad5 100644
--- a/tests/FlickerTests/QuickSwitch/trace_config/trace_config.textproto
+++ b/tests/FlickerTests/QuickSwitch/trace_config/trace_config.textproto
@@ -61,13 +61,7 @@
       atrace_categories: "input"
       atrace_categories: "binder_driver"
       atrace_categories: "sched_process_exit"
-      atrace_apps: "com.android.server.wm.flicker"
-      atrace_apps: "com.android.server.wm.flicker.other"
-      atrace_apps: "com.android.server.wm.flicker.close"
-      atrace_apps: "com.android.server.wm.flicker.ime"
-      atrace_apps: "com.android.server.wm.flicker.launch"
       atrace_apps: "com.android.server.wm.flicker.quickswitch"
-      atrace_apps: "com.android.server.wm.flicker.rotation"
       atrace_apps: "com.android.server.wm.flicker.testapp"
       atrace_apps: "com.android.systemui"
       atrace_apps: "com.google.android.apps.nexuslauncher"
diff --git a/tests/FlickerTests/Rotation/Android.bp b/tests/FlickerTests/Rotation/Android.bp
index 8e93b5b..233a276 100644
--- a/tests/FlickerTests/Rotation/Android.bp
+++ b/tests/FlickerTests/Rotation/Android.bp
@@ -30,4 +30,5 @@
     test_config_template: "AndroidTestTemplate.xml",
     srcs: ["src/**/*"],
     static_libs: ["FlickerTestsBase"],
+    data: ["trace_config/*"],
 }
diff --git a/tests/FlickerTests/Rotation/trace_config/trace_config.textproto b/tests/FlickerTests/Rotation/trace_config/trace_config.textproto
index c9a35ac..eeb542f 100644
--- a/tests/FlickerTests/Rotation/trace_config/trace_config.textproto
+++ b/tests/FlickerTests/Rotation/trace_config/trace_config.textproto
@@ -61,12 +61,6 @@
       atrace_categories: "input"
       atrace_categories: "binder_driver"
       atrace_categories: "sched_process_exit"
-      atrace_apps: "com.android.server.wm.flicker"
-      atrace_apps: "com.android.server.wm.flicker.other"
-      atrace_apps: "com.android.server.wm.flicker.close"
-      atrace_apps: "com.android.server.wm.flicker.ime"
-      atrace_apps: "com.android.server.wm.flicker.launch"
-      atrace_apps: "com.android.server.wm.flicker.quickswitch"
       atrace_apps: "com.android.server.wm.flicker.rotation"
       atrace_apps: "com.android.server.wm.flicker.testapp"
       atrace_apps: "com.android.systemui"