diff --git a/cpp/core/internal/base_pcp_handler.cc b/cpp/core/internal/base_pcp_handler.cc
index c6539ab5..79f4943c 100644
--- a/cpp/core/internal/base_pcp_handler.cc
+++ b/cpp/core/internal/base_pcp_handler.cc
@@ -104,7 +104,7 @@ Status BasePcpHandler::StartAdvertising(ClientProxy* client,
     response.Set({Status::kSuccess});
   });
   return WaitForResult(
-      absl::StrCat("StartAdvertising(", std::string(info.endpoint_info), ")"),
+      absl::StrCat("StartAdvertising(", service_id, ")"),
       client->GetClientId(), &response);
 }
 
diff --git a/cpp/core/internal/mediums/ble.cc b/cpp/core/internal/mediums/ble.cc
index a6a72486..ad334623 100644
--- a/cpp/core/internal/mediums/ble.cc
+++ b/cpp/core/internal/mediums/ble.cc
@@ -83,8 +83,7 @@ bool Ble::StartAdvertising(const std::string& service_id,
     return false;
   }
 
-  NEARBY_LOGS(INFO) << "Turning on BLE advertising with advertisement bytes="
-                    << advertisement_bytes.data() << "("
+  NEARBY_LOGS(INFO) << "Turning on BLE advertising (advertisement size="
                     << advertisement_bytes.size() << ")"
                     << ", service id=" << service_id
                     << ", fast advertisement service uuid="
diff --git a/cpp/core/internal/p2p_cluster_pcp_handler.cc b/cpp/core/internal/p2p_cluster_pcp_handler.cc
index d5e84caa..096b443a 100644
--- a/cpp/core/internal/p2p_cluster_pcp_handler.cc
+++ b/cpp/core/internal/p2p_cluster_pcp_handler.cc
@@ -1014,10 +1014,8 @@ proto::connections::Medium P2pClusterPcpHandler::StartBleAdvertising(
   }
 
   NEARBY_LOG(INFO,
-             "P2pClusterPcpHandler::StartBleAdvertising: service=%s: "
-             "make advertisement; id=%s, name=%s",
-             service_id.c_str(), local_endpoint_id.c_str(),
-             std::string(local_endpoint_info).c_str());
+             "P2pClusterPcpHandler::StartBleAdvertising: service=%s, id=%s",
+             service_id.c_str(), local_endpoint_id.c_str());
   // Generate a BleAdvertisement. If a fast advertisement service UUID was
   // provided, create a fast BleAdvertisement.
   ByteArray advertisement_bytes;
@@ -1045,10 +1043,6 @@ proto::connections::Medium P2pClusterPcpHandler::StartBleAdvertising(
                "BleAdvertisement failed");
     ble_medium_.StopAcceptingConnections(service_id);
     return proto::connections::UNKNOWN_MEDIUM;
-  } else {
-    NEARBY_LOGS(INFO) << "P2pClusterPcpHandler::StartBleAdvertising: generate "
-                         "BleAdvertisement succeeded; advertisement_bytes="
-                      << advertisement_bytes.data();
   }
 
   NEARBY_LOG(