diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceDetailsFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceDetailsFragment.kt
index b2b27ee31da900..168d46159f2424 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceDetailsFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceDetailsFragment.kt
@@ -18,7 +18,12 @@
 
 package com.google.chip.chiptool.setuppayloadscanner
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -27,6 +32,10 @@ import androidx.fragment.app.Fragment
 import com.google.chip.chiptool.R
 import com.google.chip.chiptool.databinding.ChipDeviceInfoFragmentBinding
 import com.google.chip.chiptool.util.FragmentUtil
+import java.net.URLEncoder
+import matter.onboardingpayload.OnboardingPayload
+import matter.onboardingpayload.OnboardingPayloadException
+import matter.onboardingpayload.QRCodeOnboardingPayloadGenerator
 
 /** Show the [CHIPDeviceInfo]. */
 class CHIPDeviceDetailsFragment : Fragment() {
@@ -35,6 +44,8 @@ class CHIPDeviceDetailsFragment : Fragment() {
   private val binding
     get() = _binding!!
 
+  private lateinit var onBoardingPayload: OnboardingPayload
+
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
@@ -43,17 +54,13 @@ class CHIPDeviceDetailsFragment : Fragment() {
     _binding = ChipDeviceInfoFragmentBinding.inflate(inflater, container, false)
     deviceInfo = checkNotNull(requireArguments().getParcelable(ARG_DEVICE_INFO))
 
-    binding.versionTv.text = "${deviceInfo.version}"
-    binding.vendorIdTv.text = "${deviceInfo.vendorId}"
-    binding.productIdTv.text = "${deviceInfo.productId}"
-    binding.setupCodeTv.text = "${deviceInfo.setupPinCode}"
-    binding.discriminatorTv.text = "${deviceInfo.discriminator}"
-    binding.discoveryCapabilitiesTv.text =
-      requireContext()
-        .getString(
-          R.string.chip_device_info_discovery_capabilities_text,
-          deviceInfo.discoveryCapabilities
-        )
+    binding.versionEd.setText(deviceInfo.version.toString())
+    binding.vendorIdEd.setText(deviceInfo.vendorId.toString())
+    binding.productIdEd.setText(deviceInfo.productId.toString())
+    binding.setupCodeEd.setText(deviceInfo.setupPinCode.toString())
+    binding.discriminatorEd.setText(deviceInfo.discriminator.toString())
+    binding.serialNumberEd.setText(deviceInfo.serialNumber)
+    binding.discoveryCapabilitiesTv.text = "${deviceInfo.discoveryCapabilities}"
 
     if (deviceInfo.optionalQrCodeInfoMap.isEmpty()) {
       binding.vendorTagsLabelTv.visibility = View.GONE
@@ -70,7 +77,7 @@ class CHIPDeviceDetailsFragment : Fragment() {
       }
     }
 
-    binding.commissioningFlowTv.text = "${deviceInfo.commissioningFlow}"
+    binding.commissioningFlowEd.setText(deviceInfo.commissioningFlow.toString())
 
     // commissioningFlow = 2 (Custom), read device info from Ledger
     if (deviceInfo.commissioningFlow == 2) {
@@ -81,6 +88,59 @@ class CHIPDeviceDetailsFragment : Fragment() {
       }
     }
 
+    onBoardingPayload = deviceInfo.toSetupPayload()
+    binding.qrCodeTv.text =
+      QRCodeOnboardingPayloadGenerator(onBoardingPayload)
+        .payloadBase38RepresentationWithAutoTLVBuffer()
+
+    binding.discoveryCapabilitiesEd.setText(onBoardingPayload.getRendezvousInformation().toString())
+    binding.discoveryCapabilitiesEd.addTextChangedListener(
+      object : TextWatcher {
+        override fun onTextChanged(value: CharSequence?, p1: Int, p2: Int, p3: Int) {
+          if (value.isNullOrEmpty()) {
+            return
+          }
+          onBoardingPayload.setRendezvousInformation(value.toString().toLong())
+          binding.discoveryCapabilitiesTv.text = "${onBoardingPayload.discoveryCapabilities}"
+        }
+
+        override fun afterTextChanged(p0: Editable?) {}
+
+        override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {}
+      }
+    )
+    binding.showQRCodeBtn.setOnClickListener {
+      onBoardingPayload.apply {
+        version = binding.versionEd.text.toString().toInt()
+        vendorId = binding.vendorIdEd.text.toString().toInt()
+        productId = binding.productIdEd.text.toString().toInt()
+        commissioningFlow = binding.commissioningFlowEd.text.toString().toInt()
+        setupPinCode = binding.setupCodeEd.text.toString().toLong()
+        discriminator = binding.discriminatorEd.text.toString().toInt()
+        val serialNumber = binding.serialNumberEd.text.toString()
+        try {
+          removeSerialNumber()
+        } catch (e: OnboardingPayloadException) {
+          Log.d(TAG, "Serial Number not set!")
+        }
+        if (serialNumber.isNotEmpty()) {
+          addSerialNumber(binding.serialNumberEd.text.toString())
+        }
+      }
+      val qrCode =
+        QRCodeOnboardingPayloadGenerator(onBoardingPayload)
+          .payloadBase38RepresentationWithAutoTLVBuffer()
+      Log.d(TAG, "QR Code : $qrCode")
+      binding.qrCodeTv.text = qrCode
+    }
+
+    binding.showQRCodeUriBtn.setOnClickListener {
+      val qrCodeEncode = URLEncoder.encode(binding.qrCodeTv.text.toString(), "UTF-8")
+      val qrCodeUri = getString(R.string.chip_device_info_qrcode_uri, qrCodeEncode)
+      val intent = Intent(Intent.ACTION_VIEW, Uri.parse(qrCodeUri))
+      startActivity(intent)
+    }
+
     return binding.root
   }
 
@@ -96,6 +156,7 @@ class CHIPDeviceDetailsFragment : Fragment() {
   }
 
   companion object {
+    private const val TAG = "CHIPDeviceDetailsFragment"
     private const val ARG_DEVICE_INFO = "device_info"
 
     @JvmStatic
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt
index d8fb51bbb3d844..e5a0791ba98bbb 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt
@@ -22,6 +22,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import matter.onboardingpayload.DiscoveryCapability
 import matter.onboardingpayload.OnboardingPayload
+import matter.onboardingpayload.OnboardingPayloadException
 
 /** Class to hold the CHIP device information. */
 @Parcelize
@@ -35,12 +36,37 @@ data class CHIPDeviceInfo(
   val optionalQrCodeInfoMap: Map<Int, QrCodeInfo> = mapOf(),
   val discoveryCapabilities: MutableSet<DiscoveryCapability> = mutableSetOf(),
   val isShortDiscriminator: Boolean = false,
+  val serialNumber: String = "",
   val ipAddress: String? = null,
   val port: Int = 5540
 ) : Parcelable {
 
+  fun toSetupPayload(): OnboardingPayload {
+    val onboardingPayload =
+      OnboardingPayload(
+        version,
+        vendorId,
+        productId,
+        commissioningFlow,
+        discoveryCapabilities,
+        discriminator,
+        isShortDiscriminator,
+        setupPinCode
+      )
+    if (serialNumber.isNotEmpty()) {
+      onboardingPayload.addSerialNumber(serialNumber)
+    }
+    return onboardingPayload
+  }
+
   companion object {
     fun fromSetupPayload(setupPayload: OnboardingPayload): CHIPDeviceInfo {
+      val serialNumber =
+        try {
+          setupPayload.getSerialNumber()
+        } catch (e: OnboardingPayloadException) {
+          ""
+        }
       return CHIPDeviceInfo(
         setupPayload.version,
         setupPayload.vendorId,
@@ -52,7 +78,8 @@ data class CHIPDeviceInfo(
           QrCodeInfo(info.tag, info.type, info.data, info.int32)
         },
         setupPayload.discoveryCapabilities,
-        setupPayload.hasShortDiscriminator
+        setupPayload.hasShortDiscriminator,
+        serialNumber
       )
     }
   }
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/chip_device_info_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/chip_device_info_fragment.xml
index 6e326a65008edb..4997681993ca29 100644
--- a/examples/android/CHIPTool/app/src/main/res/layout/chip_device_info_fragment.xml
+++ b/examples/android/CHIPTool/app/src/main/res/layout/chip_device_info_fragment.xml
@@ -1,5 +1,6 @@
 <ScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -26,16 +27,18 @@
             android:layout_below="@id/titleTv"
             android:layout_alignParentStart="true"
             android:textSize="20sp"/>
-        <TextView
-            android:id="@+id/versionTv"
+        <EditText
+            android:id="@+id/versionEd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginBottom="8dp"
             android:layout_below="@id/titleTv"
             android:layout_toEndOf="@id/versionLabelTv"
             android:layout_alignParentEnd="true"
-            android:textSize="20sp"/>
+            android:textSize="11sp"
+            android:autofillHints="@string/chip_device_info_version_label"
+            android:inputType="number"
+            tools:ignore="LabelFor" />
 
         <TextView
             android:id="@+id/vendorLabelTv"
@@ -46,16 +49,18 @@
             android:layout_below="@id/versionLabelTv"
             android:layout_alignParentStart="true"
             android:textSize="20sp"/>
-        <TextView
-            android:id="@+id/vendorIdTv"
+        <EditText
+            android:id="@+id/vendorIdEd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginBottom="8dp"
             android:layout_below="@id/versionLabelTv"
             android:layout_toEndOf="@id/vendorLabelTv"
             android:layout_alignParentEnd="true"
-            android:textSize="20sp"/>
+            android:textSize="11sp"
+            android:autofillHints="@string/chip_device_info_vendor_id_label"
+            android:inputType="number"
+            tools:ignore="LabelFor" />
 
         <TextView
             android:id="@+id/productIdLabelTv"
@@ -66,16 +71,18 @@
             android:layout_below="@id/vendorLabelTv"
             android:layout_alignParentStart="true"
             android:textSize="20sp"/>
-        <TextView
-            android:id="@+id/productIdTv"
+        <EditText
+            android:id="@+id/productIdEd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginBottom="8dp"
             android:layout_below="@id/vendorLabelTv"
             android:layout_toEndOf="@id/productIdLabelTv"
             android:layout_alignParentEnd="true"
-            android:textSize="20sp"/>
+            android:textSize="11sp"
+            android:autofillHints="@string/chip_device_info_product_id_label"
+            android:inputType="number"
+            tools:ignore="LabelFor" />
 
         <TextView
             android:id="@+id/discriminatorLabelTv"
@@ -86,16 +93,18 @@
             android:layout_below="@id/productIdLabelTv"
             android:layout_alignParentStart="true"
             android:textSize="20sp"/>
-        <TextView
-            android:id="@+id/discriminatorTv"
+        <EditText
+            android:id="@+id/discriminatorEd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginBottom="8dp"
             android:layout_below="@id/productIdLabelTv"
             android:layout_toEndOf="@id/discriminatorLabelTv"
             android:layout_alignParentEnd="true"
-            android:textSize="20sp"/>
+            android:textSize="11sp"
+            android:autofillHints="@string/chip_device_info_discriminator_label"
+            android:inputType="number"
+            tools:ignore="LabelFor" />
 
         <TextView
             android:id="@+id/setupCodeLabelTv"
@@ -106,16 +115,18 @@
             android:layout_below="@id/discriminatorLabelTv"
             android:layout_alignParentStart="true"
             android:textSize="20sp"/>
-        <TextView
-            android:id="@+id/setupCodeTv"
+        <EditText
+            android:id="@+id/setupCodeEd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginBottom="8dp"
             android:layout_below="@id/discriminatorLabelTv"
             android:layout_toEndOf="@id/setupCodeLabelTv"
             android:layout_alignParentEnd="true"
-            android:textSize="20sp"/>
+            android:textSize="11sp"
+            android:autofillHints="@string/chip_device_info_setup_code_label"
+            android:inputType="number"
+            tools:ignore="LabelFor" />
 
         <TextView
             android:id="@+id/vendorTagsLabelTv"
@@ -134,12 +145,33 @@
             android:layout_marginBottom="8dp"
             android:layout_below="@id/vendorTagsLabelTv"/>
 
+        <TextView
+            android:id="@+id/discoveryCapabilitiesLabelTv"
+            android:text="@string/chip_device_info_discovery_capabilities_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_below="@id/vendorTagsLabelTv"
+            android:layout_alignParentStart="true"
+            android:textSize="20sp"/>
+        <EditText
+            android:id="@+id/discoveryCapabilitiesEd"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_below="@id/vendorTagsLabelTv"
+            android:layout_toEndOf="@id/discoveryCapabilitiesLabelTv"
+            android:layout_alignParentEnd="true"
+            android:textSize="11sp"
+            android:autofillHints="@string/chip_device_info_discovery_capabilities_label"
+            android:inputType="number"
+            tools:ignore="LabelFor" />
         <TextView
             android:id="@+id/discoveryCapabilitiesTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:layout_below="@id/vendorTagsContainer"
+            android:layout_below="@id/discoveryCapabilitiesLabelTv"
             android:layout_alignParentStart="true"
             android:textSize="20sp"/>
 
@@ -152,27 +184,82 @@
             android:layout_below="@id/discoveryCapabilitiesTv"
             android:layout_alignParentStart="true"
             android:textSize="20sp"/>
-        <TextView
-            android:id="@+id/commissioningFlowTv"
+        <EditText
+            android:id="@+id/commissioningFlowEd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginBottom="8dp"
             android:layout_below="@id/discoveryCapabilitiesTv"
             android:layout_toEndOf="@id/commissioningFlowLabelTv"
             android:layout_alignParentEnd="true"
+            android:textSize="11sp"
+            android:autofillHints="@string/chip_device_info_discovery_capabilities_label"
+            android:inputType="number"
+            tools:ignore="LabelFor" />
+
+        <TextView
+            android:id="@+id/serialNumberLabelTv"
+            android:text="@string/chip_device_info_serial_number_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_below="@id/commissioningFlowLabelTv"
+            android:layout_alignParentStart="true"
             android:textSize="20sp"/>
+        <EditText
+            android:id="@+id/serialNumberEd"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_below="@id/commissioningFlowLabelTv"
+            android:layout_toEndOf="@id/serialNumberLabelTv"
+            android:layout_alignParentEnd="true"
+            android:textSize="11sp"
+            android:autofillHints="@string/chip_device_info_setup_code_label"
+            android:inputType="text"
+            tools:ignore="LabelFor" />
 
         <Button
             android:id="@+id/customFlowBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/commissioningFlowTv"
-            android:layout_alignParentBottom="true"
+            android:layout_below="@id/serialNumberLabelTv"
             android:layout_alignParentRight="true"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:visibility="invisible"
             android:text="@string/chip_device_info_custom_flow_btn_text" />
+
+        <Button
+            android:id="@+id/showQRCodeBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/customFlowBtn"
+            android:layout_alignParentRight="true"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="visible"
+            android:text="@string/chip_device_info_show_qr_code_btn_text" />
+
+        <Button
+            android:id="@+id/showQRCodeUriBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/showQRCodeBtn"
+            android:layout_alignParentRight="true"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="visible"
+            android:text="@string/chip_device_info_show_qr_code_uri_btn_text" />
+
+        <TextView
+            android:id="@+id/qrCodeTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_below="@id/showQRCodeUriBtn"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentStart="true"
+            android:textSize="20sp"/>
     </RelativeLayout>
 </ScrollView>
diff --git a/examples/android/CHIPTool/app/src/main/res/values/strings.xml b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
index 7b15bbdb53fc3e..76d603c671a75e 100644
--- a/examples/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -10,8 +10,9 @@
     <string name="chip_device_info_product_id_label">Product ID:</string>
     <string name="chip_device_info_discriminator_label">Discriminator:</string>
     <string name="chip_device_info_setup_code_label">Setup PIN Code:</string>
+    <string name="chip_device_info_serial_number_label">Serial Number:</string>
+    <string name="chip_device_info_discovery_capabilities_label">Discovery capabilities:</string>
     <string name="chip_device_info_optional_vendor_tags_label">Optional Vendor tags:</string>
-    <string name="chip_device_info_discovery_capabilities_text">Discovery capabilities: %1s</string>
     <string name="camera_permission_missing_alert_title">Camera permission missing</string>
     <string name="camera_permission_missing_alert_subtitle">Camera permission required to be able to scan the QR code.</string>
     <string name="camera_permission_missing_alert_try_again">Try again</string>
@@ -206,6 +207,9 @@
     <string name="provision_custom_flow_btn_text">Provision CHIP device with Custom Flow</string>
     <string name="chip_device_info_commissioning_flow_label">Commissioning Flow:</string>
     <string name="chip_device_info_custom_flow_btn_text">Read from Ledger</string>
+    <string name="chip_device_info_show_qr_code_btn_text">Show QR Code Value</string>
+    <string name="chip_device_info_show_qr_code_uri_btn_text">Show QR Code</string>
+    <string name="chip_device_info_qrcode_uri">https://project-chip.github.io/connectedhomeip/qrcode.html?data=%1$s</string>
     <string name="chip_ledger_info_title">Device Model Info</string>
     <string name="chip_ledger_info_commissioning_flow_url_label">Commissioning Url:</string>
     <string name="chip_ledger_info_commissioning_flow_url_text">Loading...</string>
diff --git a/src/controller/java/src/matter/onboardingpayload/DiscoveryCapability.kt b/src/controller/java/src/matter/onboardingpayload/DiscoveryCapability.kt
index 571ffbdc96f765..eafa0b6c002433 100644
--- a/src/controller/java/src/matter/onboardingpayload/DiscoveryCapability.kt
+++ b/src/controller/java/src/matter/onboardingpayload/DiscoveryCapability.kt
@@ -18,8 +18,7 @@
 package matter.onboardingpayload
 
 /** Enum values for possible bits in the onboarding paylod's discovery capabilities bitmask. */
-enum class DiscoveryCapability {
-  SOFT_AP,
-  BLE,
-  ON_NETWORK
+enum class DiscoveryCapability(val bitIndex: Int) {
+  BLE(1),
+  ON_NETWORK(2)
 }
diff --git a/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt b/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt
index f00b2cbef8ed54..bca500bdf3f7f0 100644
--- a/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt
+++ b/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt
@@ -206,8 +206,7 @@ class OnboardingPayload(
       return false
     }
 
-    val allValid =
-      setOf(DiscoveryCapability.BLE, DiscoveryCapability.ON_NETWORK, DiscoveryCapability.SOFT_AP)
+    val allValid = setOf(DiscoveryCapability.BLE, DiscoveryCapability.ON_NETWORK)
 
     // If discoveryCapabilities is not empty and discoveryCapabilities contains values outside
     // of allValid
@@ -258,19 +257,8 @@ class OnboardingPayload(
   fun getRendezvousInformation(): Long {
     var rendezvousInfo: Long = 0
 
-    if (discoveryCapabilities.contains(DiscoveryCapability.SOFT_AP)) {
-      // set bit 0
-      rendezvousInfo = rendezvousInfo or (1L shl 0)
-    }
-
-    if (discoveryCapabilities.contains(DiscoveryCapability.BLE)) {
-      // set bit 1
-      rendezvousInfo = rendezvousInfo or (1L shl 1)
-    }
-
-    if (discoveryCapabilities.contains(DiscoveryCapability.ON_NETWORK)) {
-      // set bit 2
-      rendezvousInfo = rendezvousInfo or (1L shl 2)
+    for (capability in discoveryCapabilities) {
+      rendezvousInfo = rendezvousInfo or (1L shl capability.bitIndex)
     }
 
     return rendezvousInfo
@@ -280,20 +268,18 @@ class OnboardingPayload(
     // Removes all elements from discoveryCapabilities.
     discoveryCapabilities.clear()
 
-    // bit 0 is set
-    if (rendezvousInfo and (1L shl 0) != 0L) {
-      discoveryCapabilities.add(DiscoveryCapability.SOFT_AP)
-    }
-
-    // bit 1 is set
-    if (rendezvousInfo and (1L shl 1) != 0L) {
-      discoveryCapabilities.add(DiscoveryCapability.BLE)
+    for (info in DiscoveryCapability.values()) {
+      val bitmask = 1L shl info.bitIndex
+      if (rendezvousInfo and bitmask != 0L) {
+        discoveryCapabilities.add(info)
+      }
     }
+  }
 
-    // bit 2 is set
-    if (rendezvousInfo and (1L shl 2) != 0L) {
-      discoveryCapabilities.add(DiscoveryCapability.ON_NETWORK)
-    }
+  fun setRendezvousInformation(rendezvousInfo: Set<DiscoveryCapability>) {
+    // Removes all elements from discoveryCapabilities.
+    discoveryCapabilities.clear()
+    discoveryCapabilities.addAll(rendezvousInfo)
   }
 
   /**