diff --git a/common/m2/Android.bp b/common/m2/Android.bp
index 82f94ff..fc2f7c0 100644
--- a/common/m2/Android.bp
+++ b/common/m2/Android.bp
@@ -229,17 +229,19 @@
 }
 
 java_import {
-  name: "wire-runtime",
+  name: "wire-runtime-prebuilt-jar",
   jars: [
     "repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar",
   ],
 }
 
-java_import {
-  name: "okio-prebuilt",
-  jars: [
-    "repository/com/squareup/okio/okio/1.9.0/okio-1.9.0.jar",
-  ],
+java_library_static {
+    name: "wire-runtime",
+    static_libs: [
+        "wire-runtime-prebuilt-jar",
+        "okio-lib",
+    ],
+    sdk_version: "current",
 }
 
 java_import {
diff --git a/linux-x86_64/perfetto/configs/long_trace_config.textproto b/linux-x86_64/perfetto/configs/long_trace_config.textproto
index 7e29012..3656e54 100644
--- a/linux-x86_64/perfetto/configs/long_trace_config.textproto
+++ b/linux-x86_64/perfetto/configs/long_trace_config.textproto
@@ -44,6 +44,7 @@
     name: "linux.ftrace"
     target_buffer: 0
     ftrace_config {
+      throttle_rss_stat: true
       # These parameters affect only the kernel trace buffer size and how
       # frequently it gets moved into the userspace buffer defined above.
       buffer_size_kb: 16384
diff --git a/linux-x86_64/perfetto/configs/trace_config.textproto b/linux-x86_64/perfetto/configs/trace_config.textproto
index 3b15481..8c1d090 100644
--- a/linux-x86_64/perfetto/configs/trace_config.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config.textproto
@@ -44,6 +44,7 @@
     name: "linux.ftrace"
     target_buffer: 0
     ftrace_config {
+      throttle_rss_stat: true
       # These parameters affect only the kernel trace buffer size and how
       # frequently it gets moved into the userspace buffer defined above.
       buffer_size_kb: 16384
diff --git a/linux-x86_64/perfetto/configs/trace_config_detailed.textproto b/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
index cc1e1d6..b707ffd 100644
--- a/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
@@ -44,6 +44,7 @@
     name: "linux.ftrace"
     target_buffer: 0
     ftrace_config {
+      throttle_rss_stat: true
       # These parameters affect only the kernel trace buffer size and how
       # frequently it gets moved into the userspace buffer defined above.
       buffer_size_kb: 16384
diff --git a/linux-x86_64/perfetto/configs/trace_config_experimental.textproto b/linux-x86_64/perfetto/configs/trace_config_experimental.textproto
index 46b0421..d1aa425 100644
--- a/linux-x86_64/perfetto/configs/trace_config_experimental.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config_experimental.textproto
@@ -44,6 +44,7 @@
     name: "linux.ftrace"
     target_buffer: 0
     ftrace_config {
+      throttle_rss_stat: true
       # These parameters affect only the kernel trace buffer size and how
       # frequently it gets moved into the userspace buffer defined above.
       buffer_size_kb: 16384
diff --git a/linux-x86_64/perfetto/configs/trace_config_multi_user_cuj_tests.textproto b/linux-x86_64/perfetto/configs/trace_config_multi_user_cuj_tests.textproto
index fba1ea4..f132f93 100644
--- a/linux-x86_64/perfetto/configs/trace_config_multi_user_cuj_tests.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config_multi_user_cuj_tests.textproto
@@ -47,6 +47,7 @@
     config {
         name: "linux.ftrace"
         ftrace_config {
+           throttle_rss_stat: true
            ftrace_events: "task/task_newtask"
            ftrace_events: "task/task_rename"
            ftrace_events: "sched/sched_process_exit"