diff --git a/.ci/scripts/unittest-buck2.sh b/.ci/scripts/unittest-buck2.sh
index 340f7438f02..f748be62ac1 100755
--- a/.ci/scripts/unittest-buck2.sh
+++ b/.ci/scripts/unittest-buck2.sh
@@ -9,11 +9,7 @@ set -eux
 # TODO: expand this to //...
 # TODO: can't query cadence & vulkan backends
 # TODO: can't query //kernels/prim_ops because of non-buckified stuff in OSS.
-# TODO: Make //backends/arm tests use runtime wrapper so we can just query //backends/arm/...
-buck2 query "//backends/apple/... + //backends/arm: + //backends/arm/debug/... + \
-//backends/arm/operator_support/... + //backends/arm/operators/... + \
-//backends/arm/_passes/... + //backends/arm/runtime/... + //backends/arm/tosa/... \
-+ //backends/example/... + \
+buck2 query "//backends/apple/... + //backends/example/... + \
 //backends/mediatek/... + //backends/transforms/... + \
 //backends/xnnpack/... + //configurations/... + //extension/flat_tensor: + \
 //extension/llm/runner: + //kernels/aten/... + //kernels/optimized/... + \
diff --git a/backends/arm/TARGETS b/backends/arm/TARGETS
index 0d947d63903..35b16f819e5 100644
--- a/backends/arm/TARGETS
+++ b/backends/arm/TARGETS
@@ -14,8 +14,7 @@ runtime.python_library(
         "ethosu/partitioner.py"
     ],
     deps = [
-        ":arm_vela",
-        "//executorch/backends/arm/tosa:arm_partitioner",
+        ":arm_partitioner",
     ]
 )
 runtime.python_library(
@@ -26,7 +25,7 @@ runtime.python_library(
         "vgf/partitioner.py"
     ],
     deps = [
-        "//executorch/backends/arm/tosa:arm_partitioner",
+        ":arm_partitioner",
     ]
 )
 runtime.python_library(
@@ -51,6 +50,21 @@ runtime.python_library(
         "//executorch/exir:lib",
     ],
 )
+runtime.python_library(
+    name = "arm_partitioner",
+    srcs = [
+        "tosa/backend.py",
+        "tosa/partitioner.py",
+    ],
+    deps = [
+        ":arm_backend",
+        ":constants",
+        "//executorch/backends/arm/debug:schema",
+        "//executorch/backends/arm/operator_support:operator_support",
+        "//executorch/backends/arm/_passes:passes",
+        "//executorch/exir:lib",
+    ],
+)
 runtime.python_library(
     name = "arm_backend",
     srcs = [
@@ -63,6 +77,7 @@ runtime.python_library(
         "fbsource//third-party/tosa_tools/v1.00/serialization_lib/python/serializer:serializer",
         "fbsource//third-party/tosa_tools/v0.80/serialization_lib/python/tosa:tosa",
         "fbsource//third-party/tosa_tools/v1.00/serialization_lib/python/tosa:tosa",
+        ":arm_vela",
         ":process_node",
         "//executorch/backends/arm/operators:lib",
         "//executorch/backends/arm/operators:node_visitor",
diff --git a/backends/arm/tosa/TARGETS b/backends/arm/tosa/TARGETS
index 18868054259..b1df4f37c53 100644
--- a/backends/arm/tosa/TARGETS
+++ b/backends/arm/tosa/TARGETS
@@ -59,20 +59,3 @@ runtime.python_library(
        ":specification",
     ],
 )
-
-runtime.python_library(
-    name = "arm_partitioner",
-    srcs = [
-        "backend.py",
-        "partitioner.py",
-    ],
-    deps = [
-        "//executorch/backends/arm:arm_backend",
-        "//executorch/backends/arm:constants",
-        "//executorch/backends/arm:process_node",
-        "//executorch/backends/arm/debug:schema",
-        "//executorch/backends/arm/operator_support:operator_support",
-        "//executorch/backends/arm/_passes:passes",
-        "//executorch/exir:lib",
-    ],
-)
diff --git a/devtools/TARGETS b/devtools/TARGETS
index d384e15fd4a..2236702fbc7 100644
--- a/devtools/TARGETS
+++ b/devtools/TARGETS
@@ -5,7 +5,6 @@ oncall("executorch")
 runtime.python_library(
     name = "lib",
     srcs = ["__init__.py"],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//executorch/devtools/bundled_program:core",
         "//executorch/devtools/etrecord:etrecord",
diff --git a/exir/TARGETS b/exir/TARGETS
index 557a61a0e4a..853d5e199ba 100644
--- a/exir/TARGETS
+++ b/exir/TARGETS
@@ -7,7 +7,6 @@ runtime.python_library(
     srcs = [
         "tracer.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/typing-extensions:typing-extensions",
         ":common",
@@ -47,7 +46,6 @@ runtime.python_library(
     srcs = [
         "scalar_type.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
 )
 
 runtime.python_library(
@@ -55,7 +53,6 @@ runtime.python_library(
     srcs = [
         "schema.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":scalar_type",
         "//executorch/exir/backend:compile_spec_schema",
@@ -74,7 +71,6 @@ runtime.python_library(
     srcs = [
         "tensor.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":error",
         ":schema",
@@ -88,7 +84,6 @@ runtime.python_library(
     srcs = [
         "memory.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/typing-extensions:typing-extensions",
         ":tensor",
@@ -116,7 +111,6 @@ runtime.python_library(
         "delegate.py",
         "delegate.pyi",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
     ],
@@ -146,7 +140,6 @@ runtime.python_library(
     srcs = [
         "__init__.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":tracer",
         "//caffe2:torch",
@@ -162,7 +155,6 @@ runtime.python_library(
     srcs = [
         "memory_planning.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":control_flow",
         ":delegate",
@@ -221,7 +213,6 @@ runtime.python_library(
     srcs = [
         "print_program.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":error",
         ":schema",
@@ -234,7 +225,6 @@ runtime.python_library(
     srcs = [
         "dynamic_shape.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
 )
 
 runtime.python_library(
@@ -242,7 +232,6 @@ runtime.python_library(
     srcs = [
         "pass_base.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":delegate",
         ":error",
@@ -257,7 +246,6 @@ runtime.python_library(
     srcs = [
         "pass_manager.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/typing-extensions:typing-extensions",
         ":error",
diff --git a/exir/dialects/TARGETS b/exir/dialects/TARGETS
index d1c3af732ca..39f0a9d0f1b 100644
--- a/exir/dialects/TARGETS
+++ b/exir/dialects/TARGETS
@@ -10,7 +10,6 @@ runtime.python_library(
     resources = {
         "//executorch/exir/dialects/edge:edge_yaml": "edge.yaml",
     },
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//caffe2/torchgen:torchgen",
diff --git a/exir/dialects/edge/TARGETS b/exir/dialects/edge/TARGETS
index 62768ebd72d..4fcf1948b5f 100644
--- a/exir/dialects/edge/TARGETS
+++ b/exir/dialects/edge/TARGETS
@@ -11,7 +11,6 @@ runtime.python_library(
     resources = {
         ":edge_yaml": "edge.yaml",
     },
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/ruamel-yaml:ruamel-yaml",
         "fbsource//third-party/pypi/setuptools:setuptools",
diff --git a/exir/passes/TARGETS b/exir/passes/TARGETS
index b0edb46bfb2..45e505cdc7d 100644
--- a/exir/passes/TARGETS
+++ b/exir/passes/TARGETS
@@ -7,7 +7,6 @@ runtime.python_library(
     srcs = [
         "__init__.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":const_prop_pass",
         ":debug_handle_generator_pass",
@@ -106,7 +105,6 @@ runtime.python_library(
     srcs = [
         "const_prop_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:pass_base",
@@ -119,7 +117,6 @@ runtime.python_library(
     srcs = [
         "scalar_to_tensor_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:pass_base",
@@ -131,7 +128,6 @@ runtime.python_library(
     srcs = [
         "constant_prop_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir/dialects:lib",
@@ -146,7 +142,6 @@ runtime.python_library(
     srcs = [
         "remove_graph_asserts_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
     ],
@@ -169,7 +164,6 @@ runtime.python_library(
         "_quant_patterns_and_replacements.py",
         "quant_fusion_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":replace_aten_with_edge_pass",
         "//caffe2:torch",
@@ -185,7 +179,6 @@ runtime.python_library(
     srcs = [
         "quantize_io_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "fbsource//third-party/pypi/numpy:numpy",
         "//caffe2:torch",
@@ -239,7 +232,6 @@ runtime.python_library(
     srcs = [
         "remove_mixed_type_operators.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:pass_base",
@@ -251,7 +243,6 @@ runtime.python_library(
     srcs = [
         "spec_prop_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:delegate",
@@ -265,7 +256,6 @@ runtime.python_library(
     srcs = [
         "init_mutable_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//executorch/exir:delegate",
     ],
@@ -276,7 +266,6 @@ runtime.python_library(
     srcs = [
         "sym_shape_eval_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:_warnings",
@@ -351,7 +340,6 @@ runtime.python_library(
     srcs = [
         "debug_handle_generator_pass.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:debug_handle_utils",
diff --git a/exir/tests/TARGETS b/exir/tests/TARGETS
index 2f5f36d88c8..855793d53a5 100644
--- a/exir/tests/TARGETS
+++ b/exir/tests/TARGETS
@@ -20,7 +20,6 @@ runtime.python_library(
     srcs = [
         "models.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:lib",
diff --git a/exir/verification/TARGETS b/exir/verification/TARGETS
index 19ccf197258..85251677b55 100644
--- a/exir/verification/TARGETS
+++ b/exir/verification/TARGETS
@@ -47,7 +47,6 @@ runtime.python_library(
         "arg_validator.py",
         "verifier.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//caffe2:torch",
         "//executorch/exir:error",
diff --git a/extension/pytree/TARGETS b/extension/pytree/TARGETS
index c240e69c2f1..5f09772ee38 100644
--- a/extension/pytree/TARGETS
+++ b/extension/pytree/TARGETS
@@ -38,7 +38,6 @@ runtime.python_library(
         "__init__.py",
     ],
     base_module = "executorch.extension.pytree",
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         ":pybindings",
         "//caffe2:torch",
diff --git a/extension/training/TARGETS b/extension/training/TARGETS
index f7e3ce0b827..eeed302c339 100644
--- a/extension/training/TARGETS
+++ b/extension/training/TARGETS
@@ -13,7 +13,6 @@ runtime.python_library(
     srcs = [
         "__init__.py",
     ],
-    visibility = ["//executorch/...", "@EXECUTORCH_CLIENTS"]
     deps = [
         "//executorch/extension/training/pybindings:_training_lib",
         "//executorch/extension/training/pybindings:_training_module",
diff --git a/third-party/ao b/third-party/ao
index b99904b34c0..f1acc1e2ade 160000
--- a/third-party/ao
+++ b/third-party/ao
@@ -1 +1 @@
-Subproject commit b99904b34c0fd98f8a63ec57cbc1dc4993f74793
+Subproject commit f1acc1e2ade01fef0129a3cee62b3d8e14e22602