diff --git a/src/ble/BLEEndPoint.cpp b/src/ble/BLEEndPoint.cpp
index fec8eccad656b2..fd3d59f71bb2a4 100644
--- a/src/ble/BLEEndPoint.cpp
+++ b/src/ble/BLEEndPoint.cpp
@@ -415,13 +415,6 @@ void BLEEndPoint::FinalizeClose(uint8_t oldState, uint8_t flags, BLE_ERROR err)
                 // If unsubscribe fails, release BLE connection and free end point immediately.
                 Free();
             }
-            if (!mBle->mPlatformDelegate->UnsubscribeCharacteristic(mConnObj, &CHIP_BLE_SVC_ID, &mBle->CHIP_BLE_CHAR_3_ID))
-            {
-                ChipLogError(Ble, "BtpEngine unsub failed");
-
-                // If unsubscribe fails, release BLE connection and free end point immediately.
-                Free();
-            }
             else if (mConnObj != BLE_CONNECTION_UNINITIALIZED)
             {
                 // Unsubscribe request was sent successfully, and a confirmation wasn't spontaneously generated or
diff --git a/src/ble/BleLayer.cpp b/src/ble/BleLayer.cpp
index 240173c75d5643..f9c7f47ba6ddc6 100644
--- a/src/ble/BleLayer.cpp
+++ b/src/ble/BleLayer.cpp
@@ -163,9 +163,9 @@ const ChipBleUUID BleLayer::CHIP_BLE_CHAR_2_ID = { { // 18EE2EF5-263D-4559-959F-
                                                      0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42,
                                                      0x9F, 0x9D, 0x12 } };
 
-const ChipBleUUID BleLayer::CHIP_BLE_CHAR_3_ID = { { // 18EE2EF5-263D-4559-959F-4F9C429F9D13
-                                                     0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42,
-                                                     0x9F, 0x9D, 0x13 } };
+const ChipBleUUID BleLayer::CHIP_BLE_CHAR_3_ID = { { // 64630238-8772-45F2-B87D-748A83218F04
+                                                     0x64, 0x63, 0x02, 0x38, 0x87, 0x72, 0x45, 0xF2, 0xB8, 0x7D, 0x74, 0x8A, 0x83,
+                                                     0x21, 0x8F, 0x04 } };
 
 void BleLayerObject::Release()
 {
diff --git a/src/lib/core/CHIPTLVReader.cpp b/src/lib/core/CHIPTLVReader.cpp
index 6ffbd708e168b2..a567ba17574598 100644
--- a/src/lib/core/CHIPTLVReader.cpp
+++ b/src/lib/core/CHIPTLVReader.cpp
@@ -1367,15 +1367,13 @@ CHIP_ERROR TLVReader::VerifyElement()
     }
     else
     {
-        if (mElemTag == UnknownImplicitTag) {
+        if (mElemTag == UnknownImplicitTag)
             return CHIP_ERROR_UNKNOWN_IMPLICIT_TLV_TAG;
-        }
         switch (mContainerType)
         {
         case kTLVType_NotSpecified:
-            if (IsContextTag(mElemTag)) {
+            if (IsContextTag(mElemTag))
                 return CHIP_ERROR_INVALID_TLV_TAG;
-            }
             break;
         case kTLVType_Structure:
             if (mElemTag == AnonymousTag)
diff --git a/src/platform/Linux/CHIPBluezHelper.h b/src/platform/Linux/CHIPBluezHelper.h
index fcfc7989b79c72..452115a5e6eb3f 100644
--- a/src/platform/Linux/CHIPBluezHelper.h
+++ b/src/platform/Linux/CHIPBluezHelper.h
@@ -75,7 +75,7 @@ namespace Internal {
 
 #define CHIP_PLAT_BLE_UUID_C1_STRING "18ee2ef5-263d-4559-959f-4f9c429f9d11"
 #define CHIP_PLAT_BLE_UUID_C2_STRING "18ee2ef5-263d-4559-959f-4f9c429f9d12"
-#define CHIP_PLAT_BLE_UUID_C3_STRING "18ee2ef5-263d-4559-959f-4f9c429f9d13"
+#define CHIP_PLAT_BLE_UUID_C3_STRING "64630238-8772-45F2-B87D-748A83218F04"
 
 #define CHIP_BLE_BASE_SERVICE_UUID_STRING "-0000-1000-8000-00805f9b34fb"
 #define CHIP_BLE_SERVICE_PREFIX_LENGTH 8
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 5a4db08b7b1df9..e65ddc8b766dff 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 5a4db08b7b1df9261f5e2491ccb4d0caa10e6bb3
+Subproject commit e65ddc8b766dffdad83b74d440e836c1f7bcb2ed