diff --git a/cpp/core/internal/base_pcp_handler_test.cc b/cpp/core/internal/base_pcp_handler_test.cc
index 2433916b..1f3a9657 100644
--- a/cpp/core/internal/base_pcp_handler_test.cc
+++ b/cpp/core/internal/base_pcp_handler_test.cc
@@ -658,7 +658,6 @@ TEST_P(BasePcpHandlerTest, DestructorIsCalledOnProtocolEndpoint) {
     channel_b->Close();
     bwu.Shutdown();
     pcp_handler.DisconnectFromEndpointManager();
-    bwu.Shutdown();
   }
   EXPECT_EQ(destroyed_flag.load(), mediums_count);
   env_.Stop();
diff --git a/cpp/core/internal/mediums/BUILD b/cpp/core/internal/mediums/BUILD
index 59c3fd33..8106972d 100644
--- a/cpp/core/internal/mediums/BUILD
+++ b/cpp/core/internal/mediums/BUILD
@@ -68,7 +68,6 @@ cc_library(
     visibility = [
         "//core/internal:__pkg__",
         "//core/internal/mediums:__pkg__",
-        "//core/internal/mediums/ble_v2:__pkg__",
         "//core/internal/mediums/webrtc:__pkg__",
     ],
     deps = [
diff --git a/cpp/core/internal/mediums/webrtc.cc b/cpp/core/internal/mediums/webrtc.cc
index 38d46127..3323b5e6 100644
--- a/cpp/core/internal/mediums/webrtc.cc
+++ b/cpp/core/internal/mediums/webrtc.cc
@@ -458,6 +458,13 @@ void WebRtc::SendOffer(const std::string& service_id,
   }
 
   SessionDescriptionWrapper offer = connection_flow->CreateOffer();
+  if (!offer.IsValid()) {
+    NEARBY_LOG(INFO,
+               "Unable to send offer. Failed to create our offer locally.");
+    RemoveConnectionFlow(remote_peer_id);
+    return;
+  }
+
   const webrtc::SessionDescriptionInterface& sdp = offer.GetSdp();
   if (!connection_flow->SetLocalSessionDescription(std::move(offer))) {
     NEARBY_LOG(INFO,
@@ -510,6 +517,13 @@ void WebRtc::SendAnswer(const PeerId& remote_peer_id) {
   }
 
   SessionDescriptionWrapper answer = entry->second->CreateAnswer();
+  if (!answer.IsValid()) {
+    NEARBY_LOG(INFO,
+               "Unable to send answer. Failed to create our answer locally.");
+    RemoveConnectionFlow(remote_peer_id);
+    return;
+  }
+
   const webrtc::SessionDescriptionInterface& sdp = answer.GetSdp();
   if (!entry->second->SetLocalSessionDescription(std::move(answer))) {
     NEARBY_LOG(INFO,
diff --git a/cpp/platform/base/BUILD b/cpp/platform/base/BUILD
index 55567885..3f010ebb 100644
--- a/cpp/platform/base/BUILD
+++ b/cpp/platform/base/BUILD
@@ -68,7 +68,6 @@ cc_library(
         "byte_utils.h",
     ],
     visibility = [
-        "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__",
         "//core:__subpackages__",
         "//platform/impl:__subpackages__",
         "//platform/public:__pkg__",
diff --git a/cpp/platform/impl/ios/BUILD b/cpp/platform/impl/ios/BUILD
index 04f4e39a..4d84ab30 100644
--- a/cpp/platform/impl/ios/BUILD
+++ b/cpp/platform/impl/ios/BUILD
@@ -51,11 +51,7 @@ objc_library(
     srcs = [
         "platform.mm",
     ],
-    visibility = [
-        "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__",
-        "//core:__subpackages__",
-        "//platform:__subpackages__",
-    ],
+    visibility = ["//platform:__subpackages__"],
     deps = [
         ":types",
         "//platform/api:comm",
diff --git a/cpp/platform/public/BUILD b/cpp/platform/public/BUILD
index 24b4878e..714b4859 100644
--- a/cpp/platform/public/BUILD
+++ b/cpp/platform/public/BUILD
@@ -96,7 +96,6 @@ cc_library(
         "logging.h",
     ],
     visibility = [
-        "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__",
         "//core:__subpackages__",
         "//platform:__subpackages__",
     ],
diff --git a/proto/bootstrap_enums.proto b/proto/bootstrap_enums.proto
index 6d1ade6d..236a81c9 100644
--- a/proto/bootstrap_enums.proto
+++ b/proto/bootstrap_enums.proto
@@ -16,6 +16,8 @@ syntax = "proto2";
 
 package location.nearby.proto;
 
+import "logs/proto/logs_annotations/logs_annotations.proto";
+
 option optimize_for = LITE_RUNTIME;
 option (logs_proto.file_not_used_for_logging_except_enums) = true;
 option java_api_version = 2;
diff --git a/proto/connections_enums.proto b/proto/connections_enums.proto
index 61f78ddc..db6dc409 100644
--- a/proto/connections_enums.proto
+++ b/proto/connections_enums.proto
@@ -16,7 +16,11 @@ syntax = "proto2";
 
 package location.nearby.proto.connections;
 
+import "logs/proto/logs_annotations/logs_annotations.proto";
+
 option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
 option java_package = "com.google.location.nearby.proto";
 option java_outer_classname = "ConnectionsEnums";
 option objc_class_prefix = "GNCP";
diff --git a/proto/discovery_enums.proto b/proto/discovery_enums.proto
index d63ce004..89d5f1cf 100644
--- a/proto/discovery_enums.proto
+++ b/proto/discovery_enums.proto
@@ -16,7 +16,12 @@ syntax = "proto2";
 
 package location.nearby.proto;
 
+import "logs/proto/logs_annotations/logs_annotations.proto";
+
 option optimize_for = LITE_RUNTIME;
+option jspb_use_correct_proto2_semantics = false;  // go/jspb-correct-proto2
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
 option java_package = "com.google.location.nearby.proto";
 option java_outer_classname = "DiscoveryEnums";
 
diff --git a/proto/magic_pair_enums.proto b/proto/magic_pair_enums.proto
index 0f508861..58b767f4 100644
--- a/proto/magic_pair_enums.proto
+++ b/proto/magic_pair_enums.proto
@@ -16,6 +16,8 @@ syntax = "proto2";
 
 package location.nearby.proto;
 
+import "logs/proto/logs_annotations/logs_annotations.proto";
+
 option optimize_for = LITE_RUNTIME;
 option (logs_proto.file_not_used_for_logging_except_enums) = true;
 option java_api_version = 2;
diff --git a/proto/nearby_client_enums.proto b/proto/nearby_client_enums.proto
index b932c14e..25a11831 100644
--- a/proto/nearby_client_enums.proto
+++ b/proto/nearby_client_enums.proto
@@ -16,6 +16,8 @@ syntax = "proto2";
 
 package location.nearby.proto;
 
+import "logs/proto/logs_annotations/logs_annotations.proto";
+
 option optimize_for = LITE_RUNTIME;
 option (logs_proto.file_not_used_for_logging_except_enums) = true;
 option java_api_version = 2;
@@ -27,6 +29,10 @@ option objc_class_prefix = "GNCP";
 enum UserType {
   UNKNOWN_USER_TYPE = 0;
   PRODUCTION = 1;
+  MODULEFOOD = 2;
+  TEST = 3;
+  PRESTO_DOGFOOD = 4;
+  AUTO_TEST = 5;
 }
 
 // The client that is logging.
diff --git a/proto/nearby_event_codes.proto b/proto/nearby_event_codes.proto
index fff53186..8236f772 100644
--- a/proto/nearby_event_codes.proto
+++ b/proto/nearby_event_codes.proto
@@ -16,7 +16,11 @@ syntax = "proto2";
 
 package location.nearby.proto;
 
+import "logs/proto/logs_annotations/logs_annotations.proto";
+
 option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
 option java_package = "com.google.location.nearby.proto";
 option java_outer_classname = "NearbyEventCodes";
 
diff --git a/proto/setup_enums.proto b/proto/setup_enums.proto
index f5f68b26..a74fc401 100644
--- a/proto/setup_enums.proto
+++ b/proto/setup_enums.proto
@@ -16,7 +16,11 @@ syntax = "proto2";
 
 package location.nearby.proto.setup;
 
+import "logs/proto/logs_annotations/logs_annotations.proto";
+
 option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
 option java_package = "com.google.location.nearby.proto";
 option java_outer_classname = "SetupEnums";
 option objc_class_prefix = "GNSP";
diff --git a/proto/sharing_enums.proto b/proto/sharing_enums.proto
index 82eb7258..43bb519f 100644
--- a/proto/sharing_enums.proto
+++ b/proto/sharing_enums.proto
@@ -16,7 +16,11 @@ syntax = "proto2";
 
 package location.nearby.proto.sharing;
 
+import "logs/proto/logs_annotations/logs_annotations.proto";
+
 option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
 option java_package = "com.google.location.nearby.proto";
 option java_outer_classname = "SharingEnums";
 option objc_class_prefix = "GNSHP";