diff --git a/internal/proto/analytics/connections_log.proto b/internal/proto/analytics/connections_log.proto
index f73c7959..fab34fe1 100644
--- a/internal/proto/analytics/connections_log.proto
+++ b/internal/proto/analytics/connections_log.proto
@@ -16,6 +16,7 @@ syntax = "proto2";
 
 package location.nearby.analytics.proto;
 
+// import "storage/datapol/annotations/proto/semantic_annotations.proto";
 import "proto/connections_enums.proto";
 import "proto/errorcode/error_code_enums.proto";
 
diff --git a/internal/proto/analytics/connections_log_test.cc b/internal/proto/analytics/connections_log_test.cc
index 28a3b017..8d3151ee 100644
--- a/internal/proto/analytics/connections_log_test.cc
+++ b/internal/proto/analytics/connections_log_test.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// #include "logs/proto/location/nearby/nearby_client_log.proto.h"
 #include "google/protobuf/descriptor.h"
 #include "gtest/gtest.h"
 #include "internal/platform/logging.h"
diff --git a/internal/proto/analytics/fast_pair_log.proto b/internal/proto/analytics/fast_pair_log.proto
index 0b276bb6..20f7b6c0 100644
--- a/internal/proto/analytics/fast_pair_log.proto
+++ b/internal/proto/analytics/fast_pair_log.proto
@@ -16,6 +16,7 @@ syntax = "proto2";
 
 package nearby.proto.fastpair;
 
+// import "storage/datapol/annotations/proto/semantic_annotations.proto";
 import "third_party/nearby/proto/fast_pair_enums.proto";
 import "wireless/android/privacy/annotations/proto/collection_basis_annotations.proto";
 
diff --git a/proto/connections_enums.proto b/proto/connections_enums.proto
index 4380ce64..c82b55bb 100644
--- a/proto/connections_enums.proto
+++ b/proto/connections_enums.proto
@@ -16,6 +16,9 @@ syntax = "proto2";
 
 package location.nearby.proto.connections;
 
+// import "logs/proto/logs_annotations/logs_annotations.proto";
+
+// option (logs_proto.file_not_used_for_logging_except_enums) = true;
 option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.location.nearby.proto";
 option java_outer_classname = "ConnectionsEnums";
diff --git a/proto/errorcode/error_code_enums.proto b/proto/errorcode/error_code_enums.proto
index 120566b5..f906ec79 100644
--- a/proto/errorcode/error_code_enums.proto
+++ b/proto/errorcode/error_code_enums.proto
@@ -16,6 +16,9 @@ syntax = "proto2";
 
 package location.nearby.errorcode.proto;
 
+// import "logs/proto/logs_annotations/logs_annotations.proto";
+
+// option (logs_proto.file_not_used_for_logging_except_enums) = true;
 option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.location.nearby.errorcode.proto";
 option java_outer_classname = "ErrorCodeEnums";
diff --git a/proto/fast_pair_enums.proto b/proto/fast_pair_enums.proto
index 32139563..dac39c2d 100644
--- a/proto/fast_pair_enums.proto
+++ b/proto/fast_pair_enums.proto
@@ -16,8 +16,10 @@ syntax = "proto2";
 
 package nearby.proto.fastpair;
 
-option optimize_for = LITE_RUNTIME;
+// import "logs/proto/logs_annotations/logs_annotations.proto";
 
+// option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option optimize_for = LITE_RUNTIME;
 // option java_api_version = 2;
 option java_package = "nearby.proto.fastpair";
 option java_outer_classname = "FastPairEnums";
diff --git a/proto/mediums/nfc_frames.proto b/proto/mediums/nfc_frames.proto
index 44ee520c..521c6ec2 100644
--- a/proto/mediums/nfc_frames.proto
+++ b/proto/mediums/nfc_frames.proto
@@ -16,6 +16,9 @@ syntax = "proto2";
 
 package location.nearby.mediums;
 
+// import "storage/datapol/annotations/proto/semantic_annotations.proto";
+
+// option (datapol.file_vetting_status) = "latest";
 option optimize_for = LITE_RUNTIME;
 option java_outer_classname = "NfcFramesProto";
 option java_package = "com.google.location.nearby.mediums.proto";
diff --git a/proto/sharing_enums.proto b/proto/sharing_enums.proto
index f189f22f..15279123 100644
--- a/proto/sharing_enums.proto
+++ b/proto/sharing_enums.proto
@@ -16,6 +16,9 @@ syntax = "proto2";
 
 package location.nearby.proto.sharing;
 
+// import "logs/proto/logs_annotations/logs_annotations.proto";
+
+// option (logs_proto.file_not_used_for_logging_except_enums) = true;
 option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.location.nearby.proto";
 option java_outer_classname = "SharingEnums";