diff --git a/internal/proto/analytics/BUILD b/internal/proto/analytics/BUILD
index 54242e26..27b7ab15 100644
--- a/internal/proto/analytics/BUILD
+++ b/internal/proto/analytics/BUILD
@@ -32,7 +32,12 @@ proto_library(
 proto_library(
     name = "fast_pair_log_proto",
     srcs = ["fast_pair_log.proto"],
-    deps = ["//proto:fast_pair_enums_proto"],
+    compatible_with = ["//buildenv/target:non_prod"],
+    deps = [
+        "//proto:fast_pair_enums_proto",
+        "//storage/datapol/annotations/proto:datapol_annotations",
+        "//wireless/android/privacy/annotations/proto:collection_basis_annotations",
+    ],
 )
 
 cc_proto_library(
diff --git a/internal/proto/analytics/fast_pair_log.proto b/internal/proto/analytics/fast_pair_log.proto
index 0f6a1520..0b276bb6 100644
--- a/internal/proto/analytics/fast_pair_log.proto
+++ b/internal/proto/analytics/fast_pair_log.proto
@@ -17,10 +17,12 @@ syntax = "proto2";
 package nearby.proto.fastpair;
 
 import "third_party/nearby/proto/fast_pair_enums.proto";
+import "wireless/android/privacy/annotations/proto/collection_basis_annotations.proto";
 
 option optimize_for = LITE_RUNTIME;
 option java_package = "nearby.proto.fastpair";
 option java_outer_classname = "FastPairLogProto";
+option objc_class_prefix = "GNFP";
 
 // Logging for go/magic-pair.
 //
diff --git a/proto/BUILD b/proto/BUILD
index a146574a..71c93135 100644
--- a/proto/BUILD
+++ b/proto/BUILD
@@ -43,6 +43,7 @@ proto_library(
 proto_library(
     name = "fast_pair_enums_proto",
     srcs = ["fast_pair_enums.proto"],
+    compatible_with = ["//buildenv/target:non_prod"],
 )
 
 cc_proto_library(
diff --git a/proto/fast_pair_enums.proto b/proto/fast_pair_enums.proto
index 29f65926..32139563 100644
--- a/proto/fast_pair_enums.proto
+++ b/proto/fast_pair_enums.proto
@@ -21,6 +21,7 @@ option optimize_for = LITE_RUNTIME;
 // option java_api_version = 2;
 option java_package = "nearby.proto.fastpair";
 option java_outer_classname = "FastPairEnums";
+option objc_class_prefix = "GNFP";
 
 // Enums related to logged events. For event codes, see NearbyEventCodes.
 message FastPairEvent {