diff --git a/proto/sharing_enums.proto b/proto/sharing_enums.proto
index bf0eb205..43bbe741 100644
--- a/proto/sharing_enums.proto
+++ b/proto/sharing_enums.proto
@@ -295,15 +295,26 @@ enum DataUsage {
 enum EstablishConnectionStatus {
   CONNECTION_STATUS_UNKNOWN = 0;
 
-  CONNECTION_STATUS_SUCCESS = 1;
-  CONNECTION_STATUS_FAILURE = 2;
-  CONNECTION_STATUS_CANCELLATION = 3;
-  CONNECTION_STATUS_MEDIA_UNAVAILABLE_ATTACHMENT = 4;
-  CONNECTION_STATUS_FAILED_PAIRED_KEYHANDSHAKE = 5;
-  CONNECTION_STATUS_FAILED_WRITE_INTRODUCTION = 6;
-  CONNECTION_STATUS_FAILED_NULL_CONNECTION = 7;
-  CONNECTION_STATUS_FAILED_NO_TRANSFER_UPDATE_CALLBACK = 8;
-  CONNECTION_STATUS_LOST_CONNECTIVITY = 9;
+  CONNECTION_STATUS_SUCCESS = 1
+      /* status_bucket = STATUS_SUCCESSFUL */;
+  CONNECTION_STATUS_FAILURE = 2
+      /* status_bucket = STATUS_INTERNAL_ERROR */;
+  CONNECTION_STATUS_CANCELLATION = 3
+      /* status_bucket = STATUS_CANCELLED */;
+  CONNECTION_STATUS_MEDIA_UNAVAILABLE_ATTACHMENT = 4
+      /* status_bucket = STATUS_INTERNAL_ERROR */;
+  CONNECTION_STATUS_FAILED_PAIRED_KEYHANDSHAKE = 5
+      /* status_bucket = STATUS_INTERNAL_ERROR */;
+  CONNECTION_STATUS_FAILED_WRITE_INTRODUCTION = 6
+      /* status_bucket = STATUS_INTERNAL_ERROR */;
+  CONNECTION_STATUS_FAILED_NULL_CONNECTION = 7
+      /* status_bucket = STATUS_INTERNAL_ERROR */;
+  CONNECTION_STATUS_FAILED_NO_TRANSFER_UPDATE_CALLBACK = 8
+      /* status_bucket = STATUS_INTERNAL_ERROR */;
+  CONNECTION_STATUS_LOST_CONNECTIVITY = 9
+      /* status_bucket = STATUS_INTERRUPTION */;
+  // TODO: b/341782941 - : Annote this status when it's confirmed by Nearby
+  // Connections team.
   CONNECTION_STATUS_INVALID_ADVERTISEMENT = 10;
 }
 
@@ -433,8 +444,13 @@ enum ProcessReceivedAttachmentsStatus {
 // SCAN_FOR_SHARE_TARGETS and ADVERTISE_DEVICE_PRESENCE.
 enum SessionStatus {
   UNKNOWN_SESSION_STATUS = 0;
+  SUCCEEDED_SESSION_STATUS = 1
+      /* status_bucket = STATUS_SUCCESSFUL */;
 
-  SUCCEEDED_SESSION_STATUS = 1;
+  // TODO: b/341782941 - FAILED_SESSION_STATUS occurs when the status of
+  // advertising or discovering sessions is not successful. It can be
+  // due to STATUS_INTERNAL_ERROR, STATUS_INTERRUPTION, STATUS_CANCELLED.
+  // More session statuses should be logged to determine the status.
   FAILED_SESSION_STATUS = 2;
 }