diff --git a/common/m2/Android.bp b/common/m2/Android.bp
index 629e6db..87af83b 100644
--- a/common/m2/Android.bp
+++ b/common/m2/Android.bp
@@ -314,7 +314,7 @@
     name: "grpc-netty-shaded-1.56.0-jar",
     host_supported: true,
     jars: ["repository/io/grpc/grpc-netty-shaded/1.56.0/grpc-netty-shaded-1.56.0.jar"],
-    visibility: ["//external/grpc-grpc-java/netty/shaded"],
+    visibility: ["//external/grpc-grpc-java/netty:__subpackages__"],
     licenses: ["m2_grpc_netty_shaded_1.56.0_license"],
     target: {
         windows: {
diff --git a/common/m2/repository/org/reactivestreams/reactive-streams/1.0.2/Android.bp b/common/m2/repository/org/reactivestreams/reactive-streams/1.0.2/Android.bp
new file mode 100644
index 0000000..b39b977
--- /dev/null
+++ b/common/m2/repository/org/reactivestreams/reactive-streams/1.0.2/Android.bp
@@ -0,0 +1,11 @@
+// TODO(b/326486994): remove this target once reactive-streams-jvm source is imported
+java_import_host {
+    name: "reactive-streams-1.0.2",
+    jars: ["reactive-streams-1.0.2.jar"],
+    visibility: ["//external/aws-sdk-java-v2:__subpackages__"],
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
+}
diff --git a/linux-x86_64/perfetto/Android.bp b/linux-x86_64/perfetto/Android.bp
index 86de47b..b2c0a9f 100644
--- a/linux-x86_64/perfetto/Android.bp
+++ b/linux-x86_64/perfetto/Android.bp
@@ -22,6 +22,7 @@
     srcs: [
         "trace_processor_shell",
         "configs/trace_config_detailed.textproto",
+        "configs/trace_config_multi_user_cuj_tests.textproto",
         "configs/trace_config_detailed_heapdump.textproto",
         "configs/trace_config_post_boot.textproto",
         "configs/trace_config_power.textproto",