diff --git a/MODULE.bazel b/MODULE.bazel
index 2293e5cf..76e8de80 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -64,6 +64,7 @@ git_repository(
 bazel_dep(name = "protobuf", version = "31.1")
 bazel_dep(name = "rules_android", version = "0.6.0")
 bazel_dep(name = "rules_jni", version = "0.11.1")
+bazel_dep(name = "rules_proto", version = "7.1.0")
 
 git_repository(
     name = "skia",
diff --git a/ink/storage/proto/BUILD.bazel b/ink/storage/proto/BUILD.bazel
index 4550861d..c3abb197 100644
--- a/ink/storage/proto/BUILD.bazel
+++ b/ink/storage/proto/BUILD.bazel
@@ -18,6 +18,7 @@
 
 load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
 
 package(
     default_visibility = ["//visibility:public"],
@@ -45,6 +46,14 @@ proto_library(
     srcs = ["color.proto"],
 )
 
+proto_library(
+    name = "options_proto",
+    srcs = ["options.proto"],
+    deps = [
+        "@protobuf//:descriptor_proto",
+    ],
+)
+
 proto_library(
     name = "stroke_input_batch_proto",
     srcs = ["stroke_input_batch.proto"],
@@ -108,3 +117,8 @@ cc_proto_library(
     name = "coded_numeric_run_cc_proto",
     deps = [":coded_numeric_run_proto"],
 )
+
+proto_descriptor_set(
+    name = "brush_family_proto_descriptor_set",
+    deps = [":brush_family_proto"],
+)
diff --git a/ink/storage/proto/options.proto b/ink/storage/proto/options.proto
index f11353be..31e6d354 100644
--- a/ink/storage/proto/options.proto
+++ b/ink/storage/proto/options.proto
@@ -16,19 +16,19 @@ edition = "2023";
 
 package ink.proto;
 
-import "net/proto2/proto/descriptor.proto";
+import "google/protobuf/descriptor.proto";
 
 option java_package = "com.google.ink.proto";
 option java_outer_classname = "OptionsProto";
 
 // Extend FieldOptions, MessageOptions, EnumOptions, and EnumValueOptions to
 // include Version.
-extend proto2.FieldOptions {
+extend google.protobuf.FieldOptions {
   int32 field_min_version = 525000068;
 }
-extend proto2.MessageOptions {
+extend google.protobuf.MessageOptions {
   int32 message_min_version = 525000037;
 }
-extend proto2.EnumValueOptions {
+extend google.protobuf.EnumValueOptions {
   int32 enum_value_min_version = 525000143;
 }