diff --git a/google/rpc/context/BUILD.bazel b/google/rpc/context/BUILD.bazel
index 46c13095ca..f8f53ce79a 100644
--- a/google/rpc/context/BUILD.bazel
+++ b/google/rpc/context/BUILD.bazel
@@ -97,40 +97,29 @@ go_proto_library(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
     "py_proto_library",
-)
-
-moved_proto_library(
-    name = "attribute_context_moved_proto",
-    srcs = [":attribute_context_proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
-    ],
+    "py_gapic_assembly_pkg",
 )
 
 py_proto_library(
     name = "attribute_context_py_proto",
-    deps = [":attribute_context_moved_proto"],
+    deps = [":attribute_context_proto"],
 )
 
-# Manually added target. See b/274975612 for why.
-moved_proto_library(
-    name = "audit_context_moved_proto",
-    srcs = [":audit_context_proto"],
+py_proto_library(
+    name = "audit_context_py_proto",
+    deps = [":audit_context_proto"],
+)
+
+# Open Source Packages
+py_gapic_assembly_pkg(
+    name = "rpc-context-py",
     deps = [
-        "@com_google_protobuf//:struct_proto",
+        ":attribute_context_py_proto",
+        ":audit_context_py_proto",
     ],
 )
 
-# Manually added target. See b/274975612 for why.
-py_proto_library(
-    name = "audit_context_py_proto",
-    deps = [":audit_context_moved_proto"],
-)
 
 ##############################################################################
 # PHP