From 7e520beb23a284a9143cd6914b1ead36cf92d362 Mon Sep 17 00:00:00 2001
From: joonhaengHeo <85541460+joonhaengHeo@users.noreply.github.com>
Date: Wed, 27 Sep 2023 20:32:16 +0900
Subject: [PATCH] [Android] Support group message (#29244)

* Implement Android Group message

* Add Android if_nameindex

* Add groupsetting API

* remove test code

* Restyled by whitespace

* Restyled by google-java-format

* Restyled by clang-format

* Implement Group Setting UI

* restyle kotlin

* Fix kotlin static code analysis

* Modify from comments.

* Restyled by whitespace

* Restyled by google-java-format

* Restyled by clang-format

* kotlin restyle

* Modify return value

* Update group id in commandpath

* Update kotlin codestyle

* Restyled by google-java-format

* Restyled by clang-format

* Update from comments

* Modify write path in group session

---------

Co-authored-by: Restyled.io <commits@restyled.io>
---
 .../google/chip/chiptool/CHIPToolActivity.kt  |   4 +-
 .../chip/chiptool/SelectActionFragment.kt     |   6 +
 .../clusterclient/AddressUpdateFragment.kt    |  65 +-
 .../clusterclient/GroupSettingFragment.kt     | 642 ++++++++++++++++++
 .../clusterclient/WildcardFragment.kt         |  23 +-
 .../DeviceProvisioningFragment.kt             |   4 +-
 .../google/chip/chiptool/util/DeviceIdUtil.kt |  25 +
 .../res/layout/add_access_control_dialog.xml  |  59 ++
 .../src/main/res/layout/add_group_dialog.xml  |  56 ++
 .../main/res/layout/add_key_set_dialog.xml    |  84 +++
 .../res/layout/address_update_fragment.xml    |  18 +
 .../main/res/layout/bind_key_set_dialog.xml   |  76 +++
 .../res/layout/group_setting_fragment.xml     | 151 ++++
 .../main/res/layout/remove_group_dialog.xml   |  46 ++
 .../main/res/layout/remove_key_set_dialog.xml |  46 ++
 .../res/layout/select_action_fragment.xml     |   8 +
 .../main/res/layout/send_key_set_dialog.xml   | 136 ++++
 .../main/res/layout/set_key_write_dialog.xml  |  48 ++
 .../res/layout/write_group_key_dialog.xml     |  48 ++
 .../app/src/main/res/values/strings.xml       |  35 +
 kotlin-detect-config.yaml                     |   1 +
 src/controller/CHIPDeviceController.h         |  10 +
 .../java/AndroidDeviceControllerWrapper.cpp   |   1 +
 src/controller/java/BUILD.gn                  |   1 +
 .../java/CHIPDeviceController-JNI.cpp         | 428 +++++++++++-
 src/controller/java/GroupDeviceProxy.h        |  35 +
 .../ChipDeviceController.java                 |  77 +++
 .../GroupKeySecurityPolicy.java               |  44 ++
 .../model/AttributeWriteRequest.java          |   5 +-
 .../devicecontroller/model/InvokeElement.java |  46 +-
 src/inet/InetInterface.cpp                    | 142 ++++
 src/platform/android/InetPlatformConfig.h     |   4 +
 32 files changed, 2347 insertions(+), 27 deletions(-)
 create mode 100644 examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/add_access_control_dialog.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/add_group_dialog.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/add_key_set_dialog.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/bind_key_set_dialog.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/group_setting_fragment.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/remove_group_dialog.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/remove_key_set_dialog.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/send_key_set_dialog.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/set_key_write_dialog.xml
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/write_group_key_dialog.xml
 create mode 100644 src/controller/java/GroupDeviceProxy.h
 create mode 100644 src/controller/java/src/chip/devicecontroller/GroupKeySecurityPolicy.java

diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
index 0284b007fe60ec..13f919ec057a9c 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
@@ -39,6 +39,7 @@ import com.google.chip.chiptool.setuppayloadscanner.BarcodeFragment
 import com.google.chip.chiptool.setuppayloadscanner.CHIPDeviceDetailsFragment
 import com.google.chip.chiptool.setuppayloadscanner.CHIPDeviceInfo
 import com.google.chip.chiptool.setuppayloadscanner.CHIPLedgerDetailsFragment
+import com.google.chip.chiptool.util.DeviceIdUtil
 import org.json.JSONObject
 
 class CHIPToolActivity :
@@ -94,11 +95,12 @@ class CHIPToolActivity :
     }
   }
 
-  override fun onCommissioningComplete(code: Int) {
+  override fun onCommissioningComplete(code: Int, nodeId: Long) {
     runOnUiThread {
       Toast.makeText(this, getString(R.string.commissioning_completed, code), Toast.LENGTH_SHORT)
         .show()
     }
+    DeviceIdUtil.setCommissionedNodeId(this, nodeId)
     ChipClient.getDeviceController(this).close()
     showFragment(SelectActionFragment.newInstance(), false)
   }
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
index 5932acb648d8a5..571552b86f06b2 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
@@ -30,6 +30,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import com.google.chip.chiptool.attestation.AttestationTestFragment
 import com.google.chip.chiptool.clusterclient.*
+import com.google.chip.chiptool.clusterclient.GroupSettingFragment
 import com.google.chip.chiptool.clusterclient.clusterinteraction.ClusterInteractionFragment
 import com.google.chip.chiptool.databinding.SelectActionFragmentBinding
 import com.google.chip.chiptool.provisioning.ProvisionNetworkType
@@ -71,6 +72,7 @@ class SelectActionFragment : Fragment() {
     binding.provisionCustomFlowBtn.setOnClickListener { handleProvisionCustomFlowClicked() }
     binding.wildcardBtn.setOnClickListener { handleWildcardClicked() }
     binding.unpairDeviceBtn.setOnClickListener { handleUnpairDeviceClicked() }
+    binding.groupSettingBtn.setOnClickListener { handleGroupSettingClicked() }
 
     return binding.root
   }
@@ -233,6 +235,10 @@ class SelectActionFragment : Fragment() {
     showFragment(BarcodeFragment.newInstance(), false)
   }
 
+  private fun handleGroupSettingClicked() {
+    showFragment(GroupSettingFragment.newInstance())
+  }
+
   companion object {
 
     @JvmStatic fun newInstance() = SelectActionFragment()
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt
index 2fc03050bfc2f1..b4c87dc53c6538 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt
@@ -1,9 +1,13 @@
 package com.google.chip.chiptool.clusterclient
 
+import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import chip.devicecontroller.ChipDeviceController
 import com.google.chip.chiptool.ChipClient
@@ -41,13 +45,70 @@ class AddressUpdateFragment : Fragment() {
     super.onViewCreated(view, savedInstanceState)
 
     val compressedFabricId = deviceController.compressedFabricId
-    binding.fabricIdEd.setText(compressedFabricId.toULong().toString(16).padStart(16, '0'))
-    binding.deviceIdEd.setText(DeviceIdUtil.getLastDeviceId(requireContext()).toString())
+    binding.fabricIdEd.setText(compressedFabricId.toULong().toString().padStart(16, '0'))
+    binding.deviceIdEd.setText(DeviceIdUtil.getLastDeviceId(requireContext()).toString(16))
     binding.epIdEd.setText(endpointId.toString())
+
+    updateDeviceIdSpinner()
+  }
+
+  fun updateDeviceIdSpinner() {
+    val deviceIdList = DeviceIdUtil.getCommissionedNodeId(requireContext())
+    binding.deviceIdSpinner.adapter =
+      ArrayAdapter(requireContext(), android.R.layout.simple_spinner_dropdown_item, deviceIdList)
+    binding.deviceIdSpinner.onItemSelectedListener =
+      object : AdapterView.OnItemSelectedListener {
+        override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+          binding.deviceIdEd.setText(deviceIdList[position].toULong(16).toString())
+        }
+
+        override fun onNothingSelected(parent: AdapterView<*>?) {
+          Log.d(TAG, "onNothingSelected")
+        }
+      }
   }
 
   override fun onDestroyView() {
     super.onDestroyView()
     _binding = null
   }
+
+  suspend fun getDevicePointer(context: Context): Long {
+    return if (isGroupId()) {
+      deviceController.getGroupDevicePointer(getGroupId().toInt())
+    } else {
+      ChipClient.getConnectedDevicePointer(context, getNodeId().toLong())
+    }
+  }
+
+  fun isGroupId(): Boolean {
+    return isGroupNodeId(getNodeId())
+  }
+
+  fun getGroupId(): UInt {
+    return getGroupIdFromNodeId(getNodeId())
+  }
+
+  fun getNodeId(): ULong {
+    return binding.deviceIdEd.text.toString().toULong()
+  }
+
+  companion object {
+    private const val TAG = "AddressUpdateFragment"
+    // Refer from NodeId.h (src/lib/core/NodeId.h)
+    private const val MIN_GROUP_NODE_ID = 0xFFFF_FFFF_FFFF_0000UL
+    private const val MASK_GROUP_ID = 0x0000_0000_0000_FFFFUL
+
+    fun isGroupNodeId(nodeId: ULong): Boolean {
+      return nodeId >= MIN_GROUP_NODE_ID
+    }
+
+    fun getNodeIdFromGroupId(groupId: UInt): ULong {
+      return groupId.toULong() or MIN_GROUP_NODE_ID
+    }
+
+    fun getGroupIdFromNodeId(nodeId: ULong): UInt {
+      return (nodeId and MASK_GROUP_ID).toUInt()
+    }
+  }
 }
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
new file mode 100644
index 00000000000000..d517fe7452018c
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt
@@ -0,0 +1,642 @@
+package com.google.chip.chiptool.clusterclient
+
+import android.app.AlertDialog
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Spinner
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.ClusterIDMapping
+import chip.devicecontroller.GroupKeySecurityPolicy
+import chip.devicecontroller.InvokeCallback
+import chip.devicecontroller.ReportCallback
+import chip.devicecontroller.WriteAttributesCallback
+import chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct
+import chip.devicecontroller.cluster.structs.GroupKeyManagementClusterGroupKeySetStruct
+import chip.devicecontroller.model.AttributeWriteRequest
+import chip.devicecontroller.model.ChipAttributePath
+import chip.devicecontroller.model.ChipEventPath
+import chip.devicecontroller.model.InvokeElement
+import chip.devicecontroller.model.NodeState
+import chip.tlv.AnonymousTag
+import chip.tlv.ContextSpecificTag
+import chip.tlv.TlvReader
+import chip.tlv.TlvWriter
+import com.google.chip.chiptool.ChipClient
+import com.google.chip.chiptool.GenericChipDeviceListener
+import com.google.chip.chiptool.R
+import com.google.chip.chiptool.databinding.GroupSettingFragmentBinding
+import com.google.chip.chiptool.util.DeviceIdUtil
+import java.lang.Exception
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+class GroupSettingFragment : Fragment() {
+  private val deviceController: ChipDeviceController
+    get() = ChipClient.getDeviceController(requireContext())
+
+  private lateinit var scope: CoroutineScope
+
+  private lateinit var addressUpdateFragment: AddressUpdateFragment
+
+  private var _binding: GroupSettingFragmentBinding? = null
+  private val binding
+    get() = _binding!!
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View {
+    _binding = GroupSettingFragmentBinding.inflate(inflater, container, false)
+    scope = viewLifecycleOwner.lifecycleScope
+
+    deviceController.setCompletionListener(ChipControllerCallback())
+
+    addressUpdateFragment =
+      childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
+
+    binding.sendKeySetWriteBtn.setOnClickListener { sendKeySetWriteBtnClick() }
+    binding.writeGroupKeyMapBtn.setOnClickListener { writeGroupKeyMapBtnClick() }
+    binding.sendAddGroupBtn.setOnClickListener { sendAddGroupBtnClick() }
+    binding.addAccessControlBtn.setOnClickListener { scope.launch { readAccessControl() } }
+    binding.addGroupBtn.setOnClickListener { addGroupBtnClick() }
+    binding.removeGroupBtn.setOnClickListener { removeGroupBtnClick() }
+    binding.addkeysetBtn.setOnClickListener { addKeySetBtnClick() }
+    binding.removekeysetBtn.setOnClickListener { removeKeySetBtnClick() }
+    binding.bindkeysetBtn.setOnClickListener { bindKeySetBtnClick(true) }
+    binding.unbindkeysetBtn.setOnClickListener { bindKeySetBtnClick(false) }
+
+    return binding.root
+  }
+
+  private fun addGroupBtnClick() {
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.add_group_dialog, null)
+    val groupIdEd = dialogView.findViewById<EditText>(R.id.groupIdEd)
+    val groupNameEd = dialogView.findViewById<EditText>(R.id.groupNameEd)
+
+    dialogView.findViewById<Button>(R.id.sendGroupDialogBtn).visibility = View.GONE
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.addGroupDialogBtn).setOnClickListener {
+      val groupId = groupIdEd.text.toString().toUInt()
+      val ret = deviceController.addGroup(groupId.toInt(), groupNameEd.text.toString())
+      showMessage("addGroup : $ret")
+      updateGroupSettingView()
+      DeviceIdUtil.setCommissionedNodeId(
+        requireContext(),
+        AddressUpdateFragment.getNodeIdFromGroupId(groupId).toLong()
+      )
+      addressUpdateFragment.updateDeviceIdSpinner()
+      requireActivity().runOnUiThread { dialog.dismiss() }
+    }
+    dialog.show()
+  }
+
+  private fun removeGroupBtnClick() {
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.remove_group_dialog, null)
+
+    val groupList = deviceController.availableGroupIds
+
+    val groupListSp = dialogView.findViewById<Spinner>(R.id.groupListSp)
+    groupListSp.adapter =
+      ArrayAdapter(
+        requireContext(),
+        android.R.layout.simple_spinner_dropdown_item,
+        groupList.map { it.toString() }
+      )
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.removeGroupDialogBtn).setOnClickListener {
+      val selectedGroupId = groupListSp.selectedItem.toString().toUInt()
+      val ret = deviceController.removeGroup(selectedGroupId.toInt())
+      showMessage("removeGroup : $selectedGroupId - $ret")
+      updateGroupSettingView()
+      DeviceIdUtil.removeCommissionedNodeId(
+        requireContext(),
+        AddressUpdateFragment.getNodeIdFromGroupId(selectedGroupId).toLong()
+      )
+      addressUpdateFragment.updateDeviceIdSpinner()
+      requireActivity().runOnUiThread { dialog.dismiss() }
+    }
+    dialog.show()
+  }
+
+  private fun addKeySetBtnClick() {
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.add_key_set_dialog, null)
+    val keySetIdEd = dialogView.findViewById<EditText>(R.id.keySetIdEd)
+    val keySecurityPolicySp = dialogView.findViewById<Spinner>(R.id.keySecurityPolicySp)
+    keySecurityPolicySp.adapter =
+      ArrayAdapter(
+        requireContext(),
+        android.R.layout.simple_spinner_dropdown_item,
+        GroupKeySecurityPolicy.values()
+      )
+    val validityTimeEd = dialogView.findViewById<EditText>(R.id.validityTimeEd)
+    val epochKeyEd = dialogView.findViewById<EditText>(R.id.epochKeyEd)
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.addKeySetDialogBtn).setOnClickListener {
+      val ret =
+        deviceController.addKeySet(
+          keySetIdEd.text.toString().toUInt().toInt(),
+          GroupKeySecurityPolicy.valueOf(keySecurityPolicySp.selectedItem.toString()),
+          validityTimeEd.text.toString().toULong().toLong(),
+          hexStringToByteArray(epochKeyEd.text.toString())
+        )
+      showMessage("addKeySet : $ret")
+      updateGroupSettingView()
+      requireActivity().runOnUiThread { dialog.dismiss() }
+    }
+    dialog.show()
+  }
+
+  private fun removeKeySetBtnClick() {
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.remove_key_set_dialog, null)
+
+    val keySetList = deviceController.keySetIds
+
+    val keySetListSp = dialogView.findViewById<Spinner>(R.id.keySetListSp)
+    keySetListSp.adapter =
+      ArrayAdapter(
+        requireContext(),
+        android.R.layout.simple_spinner_dropdown_item,
+        keySetList.map { it.toString() }
+      )
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.removeGroupDialogBtn).setOnClickListener {
+      val selectedKeySetId = keySetListSp.selectedItem.toString().toInt()
+      val ret = deviceController.removeKeySet(selectedKeySetId)
+      showMessage("removeKeySet : $selectedKeySetId - $ret")
+      updateGroupSettingView()
+      requireActivity().runOnUiThread { dialog.dismiss() }
+    }
+    dialog.show()
+  }
+
+  private fun bindKeySetBtnClick(isBind: Boolean) {
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.bind_key_set_dialog, null)
+
+    val groupList = deviceController.availableGroupIds
+    val keySetList = deviceController.keySetIds
+
+    val groupSp = dialogView.findViewById<Spinner>(R.id.groupSp)
+    groupSp.adapter =
+      ArrayAdapter(
+        requireContext(),
+        android.R.layout.simple_spinner_dropdown_item,
+        groupList.map { it.toString() }
+      )
+
+    val keySetSp = dialogView.findViewById<Spinner>(R.id.keySetSp)
+    keySetSp.adapter =
+      ArrayAdapter(
+        requireContext(),
+        android.R.layout.simple_spinner_dropdown_item,
+        keySetList.map { it.toString() }
+      )
+
+    dialogView.findViewById<Button>(R.id.bindKeySetDialogBtn).visibility =
+      if (isBind) {
+        View.VISIBLE
+      } else {
+        View.GONE
+      }
+    dialogView.findViewById<Button>(R.id.unbindKeySetDialogBtn).visibility =
+      if (!isBind) {
+        View.VISIBLE
+      } else {
+        View.GONE
+      }
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.bindKeySetDialogBtn).setOnClickListener {
+      val groupId = groupSp.selectedItem.toString().toUInt().toInt()
+      val keySetId = keySetSp.selectedItem.toString().toUInt().toInt()
+      val ret = deviceController.bindKeySet(groupId, keySetId)
+      showMessage("bindKeySet : $groupId, $keySetId - $ret")
+      updateGroupSettingView()
+      requireActivity().runOnUiThread { dialog.dismiss() }
+    }
+
+    dialogView.findViewById<Button>(R.id.unbindKeySetDialogBtn).setOnClickListener {
+      val groupId = groupSp.selectedItem.toString().toUInt().toInt()
+      val keySetId = keySetSp.selectedItem.toString().toUInt().toInt()
+      val ret = deviceController.unbindKeySet(groupId, keySetId)
+      showMessage("unbindKeySet : $groupId, $keySetId - $ret")
+      updateGroupSettingView()
+      requireActivity().runOnUiThread { dialog.dismiss() }
+    }
+    dialog.show()
+  }
+
+  private fun sendKeySetWriteBtnClick() {
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.send_key_set_dialog, null)
+    val keySetIdEd = dialogView.findViewById<EditText>(R.id.keySetIdEd)
+    val keySecurityPolicySp = dialogView.findViewById<Spinner>(R.id.keySecurityPolicySp)
+    keySecurityPolicySp.adapter =
+      ArrayAdapter(
+        requireContext(),
+        android.R.layout.simple_spinner_dropdown_item,
+        GroupKeySecurityPolicy.values()
+      )
+    val epochKey0Ed = dialogView.findViewById<EditText>(R.id.epochKey0Ed)
+    val epochStartTime0Ed = dialogView.findViewById<EditText>(R.id.epochStartTime0Ed)
+    val epochKey1Ed = dialogView.findViewById<EditText>(R.id.epochKey1Ed)
+    val epochStartTime1Ed = dialogView.findViewById<EditText>(R.id.epochStartTime1Ed)
+    val epochKey2Ed = dialogView.findViewById<EditText>(R.id.epochKey2Ed)
+    val epochStartTime2Ed = dialogView.findViewById<EditText>(R.id.epochStartTime2Ed)
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.addKeySetDialogBtn).setOnClickListener {
+      scope.launch {
+        val keySetWritestruct =
+          GroupKeyManagementClusterGroupKeySetStruct(
+            keySetIdEd.text.toString().toUInt(),
+            GroupKeySecurityPolicy.valueOf(keySecurityPolicySp.selectedItem.toString()).id.toUInt(),
+            hexStringToByteArray(epochKey0Ed.text.toString()),
+            epochStartTime0Ed.text.toString().toULong(),
+            hexStringToByteArray(epochKey1Ed.text.toString()),
+            epochStartTime1Ed.text.toString().toULong(),
+            hexStringToByteArray(epochKey2Ed.text.toString()),
+            epochStartTime2Ed.text.toString().toULong()
+          )
+        sendKeySetWrite(keySetWritestruct)
+        requireActivity().runOnUiThread { dialog.dismiss() }
+      }
+    }
+    dialog.show()
+  }
+
+  private suspend fun sendKeySetWrite(
+    groupKeySetStruct: GroupKeyManagementClusterGroupKeySetStruct
+  ) {
+    val tlvWriter =
+      TlvWriter()
+        .startStructure(AnonymousTag)
+        .apply {
+          groupKeySetStruct.toTlv(
+            ContextSpecificTag(
+              ClusterIDMapping.GroupKeyManagement.KeySetWriteCommandField.GroupKeySet.id
+            ),
+            this
+          )
+        }
+        .endStructure()
+
+    deviceController.invoke(
+      object : InvokeCallback {
+        override fun onError(e: java.lang.Exception?) {
+          Log.d(TAG, "onError : ", e)
+          showMessage("onError : ${e.toString()}")
+        }
+
+        override fun onResponse(invokeElement: InvokeElement?, successCode: Long) {
+          Log.d(TAG, "onResponse")
+          showMessage("onResponse : $successCode")
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      InvokeElement.newInstance(
+        0,
+        ClusterIDMapping.GroupKeyManagement.ID,
+        ClusterIDMapping.GroupKeyManagement.Command.KeySetWrite.id,
+        tlvWriter.getEncoded(),
+        null
+      ),
+      0,
+      0
+    )
+  }
+
+  private fun writeGroupKeyMapBtnClick() {
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.write_group_key_dialog, null)
+    val groupIdEd = dialogView.findViewById<EditText>(R.id.groupIdEd)
+    val groupKeySetIdEd = dialogView.findViewById<EditText>(R.id.groupKeySetIdEd)
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.writeGroupKeyMapBtn).setOnClickListener {
+      scope.launch {
+        writeGroupKeyMap(
+          groupIdEd.text.toString().toUInt(),
+          groupKeySetIdEd.text.toString().toUInt()
+        )
+        requireActivity().runOnUiThread { dialog.dismiss() }
+      }
+    }
+    dialog.show()
+  }
+
+  private suspend fun writeGroupKeyMap(groupId: UInt, groupKeySetId: UInt) {
+    val tlvWriter =
+      TlvWriter().apply {
+        startArray(AnonymousTag)
+        startStructure(AnonymousTag)
+        put(ContextSpecificTag(1), groupId)
+        put(ContextSpecificTag(2), groupKeySetId)
+        endStructure()
+        endArray()
+      }
+
+    deviceController.write(
+      object : WriteAttributesCallback {
+        override fun onError(attributePath: ChipAttributePath?, e: Exception?) {
+          Log.d(TAG, "onError : ", e)
+          showMessage("Error : ${e.toString()}")
+        }
+
+        override fun onResponse(attributePath: ChipAttributePath?) {
+          Log.d(TAG, "onResponse")
+          showMessage("write Success")
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      listOf(
+        AttributeWriteRequest.newInstance(
+          0,
+          ClusterIDMapping.GroupKeyManagement.ID,
+          ClusterIDMapping.GroupKeyManagement.Attribute.GroupKeyMap.id,
+          tlvWriter.getEncoded()
+        )
+      ),
+      0,
+      0
+    )
+  }
+
+  private fun sendAddGroupBtnClick() {
+    val dialogView = requireActivity().layoutInflater.inflate(R.layout.add_group_dialog, null)
+    val groupIdEd = dialogView.findViewById<EditText>(R.id.groupIdEd)
+    val groupNameEd = dialogView.findViewById<EditText>(R.id.groupNameEd)
+
+    dialogView.findViewById<Button>(R.id.addGroupDialogBtn).visibility = View.GONE
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.sendGroupDialogBtn).setOnClickListener {
+      scope.launch {
+        sendAddGroup(groupIdEd.text.toString().toUInt(), groupNameEd.text.toString())
+        requireActivity().runOnUiThread { dialog.dismiss() }
+      }
+    }
+    dialog.show()
+  }
+
+  private suspend fun sendAddGroup(groupId: UInt, groupName: String) {
+    val tlvWriter =
+      TlvWriter().apply {
+        startStructure(AnonymousTag)
+        put(ContextSpecificTag(0), groupId)
+        put(ContextSpecificTag(1), groupName)
+        endStructure()
+      }
+
+    deviceController.invoke(
+      object : InvokeCallback {
+        override fun onError(e: Exception?) {
+          Log.d(TAG, "onError : ", e)
+          showMessage("Error : ${e.toString()}")
+        }
+
+        override fun onResponse(invokeElement: InvokeElement?, successCode: Long) {
+          Log.d(TAG, "onResponse")
+          showMessage("onResponse : $successCode")
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      InvokeElement.newInstance(
+        0,
+        ClusterIDMapping.Groups.ID,
+        ClusterIDMapping.Groups.Command.AddGroup.id,
+        tlvWriter.getEncoded(),
+        null
+      ),
+      0,
+      0
+    )
+  }
+
+  private suspend fun readAccessControl() {
+    val endpointId = 0
+    val clusterId = ClusterIDMapping.AccessControl.ID
+    val attributeId = ClusterIDMapping.AccessControl.Attribute.Acl.id
+
+    val attributePath = ChipAttributePath.newInstance(endpointId, clusterId, attributeId)
+    deviceController.readAttributePath(
+      object : ReportCallback {
+        override fun onError(
+          attributePath: ChipAttributePath?,
+          eventPath: ChipEventPath?,
+          e: Exception
+        ) {
+          Log.d(TAG, "onError : ", e)
+          showMessage("Error : $e")
+        }
+
+        override fun onReport(nodeState: NodeState?) {
+          Log.d(TAG, "onResponse")
+          val tlv =
+            nodeState
+              ?.getEndpointState(endpointId)
+              ?.getClusterState(clusterId)
+              ?.getAttributeState(attributeId)
+              ?.tlv
+          requireActivity().runOnUiThread { showAddAccessControlDialog(tlv) }
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      listOf(attributePath),
+      0
+    )
+  }
+
+  private fun showAddAccessControlDialog(tlv: ByteArray?) {
+    if (tlv == null) {
+      Log.d(TAG, "Access Control read fail")
+      showMessage("Access Control read fail")
+      return
+    }
+
+    val dialogView =
+      requireActivity().layoutInflater.inflate(R.layout.add_access_control_dialog, null)
+    val groupIdEd = dialogView.findViewById<EditText>(R.id.groupIdEd)
+    val accessControlEntrySp = dialogView.findViewById<Spinner>(R.id.accessControlEntrySp)
+    accessControlEntrySp.adapter =
+      ArrayAdapter(
+        requireContext(),
+        android.R.layout.simple_spinner_dropdown_item,
+        AccessControlEntry.values()
+      )
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.addAccessControlBtn).setOnClickListener {
+      scope.launch {
+        sendAccessControl(
+          tlv,
+          groupIdEd.text.toString().toUInt(),
+          AccessControlEntry.valueOf(accessControlEntrySp.selectedItem.toString()).id
+        )
+        requireActivity().runOnUiThread { dialog.dismiss() }
+      }
+    }
+    dialog.show()
+  }
+
+  private suspend fun sendAccessControl(tlv: ByteArray, groupId: UInt, privilege: UInt) {
+    val tlvWriter = TlvWriter().startArray(AnonymousTag)
+    var entryStructList: List<AccessControlClusterAccessControlEntryStruct>
+    TlvReader(tlv).also {
+      entryStructList = buildList {
+        it.enterArray(AnonymousTag)
+        while (!it.isEndOfContainer()) {
+          add(AccessControlClusterAccessControlEntryStruct.fromTlv(AnonymousTag, it))
+        }
+        it.exitContainer()
+      }
+    }
+
+    // If GroupID is already added to AccessControl, do not add it.
+    for (entry in entryStructList) {
+      if (
+        entry.authMode == 3U /* Group */ &&
+          entry.subjects != null &&
+          entry.subjects!!.contains(groupId.toULong())
+      ) {
+        continue
+      }
+
+      entry.toTlv(AnonymousTag, tlvWriter)
+    }
+
+    val newEntry =
+      AccessControlClusterAccessControlEntryStruct(
+        privilege,
+        3U /* Group */,
+        listOf(groupId.toULong()),
+        null,
+        deviceController.fabricIndex.toUInt()
+      )
+    newEntry.toTlv(AnonymousTag, tlvWriter)
+    tlvWriter.endArray()
+
+    deviceController.write(
+      object : WriteAttributesCallback {
+        override fun onError(attributePath: ChipAttributePath?, e: Exception?) {
+          Log.d(TAG, "onError : ", e)
+          showMessage("Error : ${e.toString()}")
+        }
+
+        override fun onResponse(attributePath: ChipAttributePath?) {
+          Log.d(TAG, "onResponse")
+          showMessage("write Success")
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      listOf(
+        AttributeWriteRequest.newInstance(
+          0,
+          ClusterIDMapping.AccessControl.ID,
+          ClusterIDMapping.AccessControl.Attribute.Acl.id,
+          tlvWriter.getEncoded()
+        )
+      ),
+      0,
+      0
+    )
+  }
+
+  override fun onStart() {
+    super.onStart()
+
+    updateGroupSettingView()
+  }
+
+  private fun updateGroupSettingView() {
+    requireActivity().runOnUiThread {
+      var viewString = "Group :\n"
+
+      for (groupId in deviceController.availableGroupIds) {
+        val keySetIdString =
+          if (deviceController.findKeySetId(groupId).isPresent) {
+            deviceController.findKeySetId(groupId).get().toString()
+          } else {
+            "[]"
+          }
+        viewString += "\t$groupId, ${deviceController.getGroupName(groupId)}, $keySetIdString\n"
+      }
+
+      viewString += "\nKeySet :\n"
+      for (keySetId in deviceController.keySetIds) {
+        viewString +=
+          "\t$keySetId, ${deviceController.getKeySecurityPolicy(keySetId).map { it.name }}\n"
+      }
+
+      binding.multiAdminClusterCommandStatus.text = viewString
+    }
+  }
+
+  override fun onDestroyView() {
+    super.onDestroyView()
+    _binding = null
+  }
+
+  inner class ChipControllerCallback : GenericChipDeviceListener() {
+    override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
+      Log.d(TAG, "onCommissioningComplete for nodeId $nodeId: $errorCode")
+    }
+
+    override fun onNotifyChipConnectionClosed() {
+      Log.d(TAG, "onNotifyChipConnectionClosed")
+    }
+
+    override fun onCloseBleComplete() {
+      Log.d(TAG, "onCloseBleComplete")
+    }
+
+    override fun onError(error: Throwable?) {
+      Log.d(TAG, "onError: $error")
+    }
+  }
+
+  private fun showMessage(msg: String) {
+    requireActivity().runOnUiThread { binding.groupSettingStatusTv.text = msg }
+  }
+
+  companion object {
+    private const val TAG = "GroupSettingFragment"
+
+    fun newInstance(): GroupSettingFragment = GroupSettingFragment()
+
+    private const val HEX_RADIX = 16
+    private const val HEX_BIT_SHIFT = 4
+
+    private fun hexStringToByteArray(hexString: String): ByteArray {
+      val len = hexString.length
+      val data = ByteArray(len / 2)
+      var i = 0
+      while (i < len) {
+        data[i / 2] =
+          ((Character.digit(hexString[i], HEX_RADIX) shl HEX_BIT_SHIFT) +
+              Character.digit(hexString[i + 1], HEX_RADIX))
+            .toByte()
+        i += 2
+      }
+      return data
+    }
+
+    enum class AccessControlEntry(val id: UInt) {
+      Manage(4U),
+      Operate(3U),
+      ProxyView(2U),
+      View(1U),
+      Administer(5U)
+    }
+  }
+}
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt
index aa939250bdff51..6103af7f7350de 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt
@@ -305,7 +305,12 @@ class WildcardFragment : Fragment() {
     timedRequestTimeoutMs: Int,
     imTimeoutMs: Int
   ) {
-    val endpointId = getChipPathIdForText(binding.endpointIdEd.text.toString())
+    val endpointId =
+      if (!addressUpdateFragment.isGroupId()) {
+        getChipPathIdForText(binding.endpointIdEd.text.toString())
+      } else {
+        null
+      }
     val clusterId = getChipPathIdForText(binding.clusterIdEd.text.toString())
     val attributeId = getChipPathIdForText(binding.attributeIdEd.text.toString())
 
@@ -348,7 +353,7 @@ class WildcardFragment : Fragment() {
 
     deviceController.write(
       writeAttributeCallback,
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      addressUpdateFragment.getDevicePointer(requireContext()),
       listOf(writeRequest),
       timedRequestTimeoutMs,
       imTimeoutMs
@@ -362,10 +367,20 @@ class WildcardFragment : Fragment() {
 
     val jsonString = invokeJson.ifEmpty { "{}" }
     val invokeElement =
-      InvokeElement.newInstance(endpointId, clusterId, commandId, null, jsonString)
+      if (addressUpdateFragment.isGroupId()) {
+        InvokeElement.newGroupInstance(
+          addressUpdateFragment.getGroupId().toInt(),
+          clusterId,
+          commandId,
+          null,
+          jsonString
+        )
+      } else {
+        InvokeElement.newInstance(endpointId, clusterId, commandId, null, jsonString)
+      }
     deviceController.invoke(
       invokeCallback,
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      addressUpdateFragment.getDevicePointer(requireContext()),
       invokeElement,
       timedRequestTimeoutMs,
       imTimeoutMs
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/DeviceProvisioningFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/DeviceProvisioningFragment.kt
index 4bbc4e0cce549c..999bc6bc1b5513 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/DeviceProvisioningFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/DeviceProvisioningFragment.kt
@@ -251,7 +251,7 @@ class DeviceProvisioningFragment : Fragment() {
     override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
       if (errorCode == STATUS_PAIRING_SUCCESS) {
         FragmentUtil.getHost(this@DeviceProvisioningFragment, Callback::class.java)
-          ?.onCommissioningComplete(0)
+          ?.onCommissioningComplete(0, nodeId)
       } else {
         showMessage(R.string.rendezvous_over_ble_pairing_failure_text)
         FragmentUtil.getHost(this@DeviceProvisioningFragment, Callback::class.java)
@@ -289,7 +289,7 @@ class DeviceProvisioningFragment : Fragment() {
   /** Callback from [DeviceProvisioningFragment] notifying any registered listeners. */
   interface Callback {
     /** Notifies that commissioning has been completed. */
-    fun onCommissioningComplete(code: Int)
+    fun onCommissioningComplete(code: Int, nodeId: Long = 0L)
   }
 
   companion object {
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/util/DeviceIdUtil.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/util/DeviceIdUtil.kt
index 415662b0116b0a..1145d335625e82 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/util/DeviceIdUtil.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/util/DeviceIdUtil.kt
@@ -7,7 +7,9 @@ import android.content.SharedPreferences
 object DeviceIdUtil {
   private const val PREFERENCE_FILE_KEY = "com.google.chip.chiptool.PREFERENCE_FILE_KEY"
   private const val DEVICE_ID_PREFS_KEY = "device_id"
+  private const val DEVICE_ID_LIST_PREFS_KEY = "device_id_list"
   private const val DEFAULT_DEVICE_ID = 1L
+  private const val HEX_RADIX = 16
 
   fun getNextAvailableId(context: Context): Long {
     val prefs = getPrefs(context)
@@ -23,6 +25,29 @@ object DeviceIdUtil {
     getPrefs(context).edit().putLong(DEVICE_ID_PREFS_KEY, newId).apply()
   }
 
+  fun setCommissionedNodeId(context: Context, nodeId: Long) {
+    val nodeList = getCommissionedNodeId(context)
+
+    nodeList.add(nodeId.toULong().toString(HEX_RADIX))
+
+    getPrefs(context).edit().putStringSet(DEVICE_ID_LIST_PREFS_KEY, nodeList.toSet()).apply()
+  }
+
+  fun removeCommissionedNodeId(context: Context, nodeId: Long) {
+    val nodeList = getCommissionedNodeId(context)
+    if (!nodeList.contains(nodeId.toULong().toString())) {
+      return
+    }
+
+    nodeList.remove(nodeId.toULong().toString())
+    getPrefs(context).edit().putStringSet(DEVICE_ID_LIST_PREFS_KEY, nodeList.toSet()).apply()
+  }
+
+  fun getCommissionedNodeId(context: Context): ArrayList<String> {
+    val nodeList = getPrefs(context).getStringSet(DEVICE_ID_LIST_PREFS_KEY, setOf()) ?: setOf()
+    return ArrayList(nodeList.toList())
+  }
+
   fun getLastDeviceId(context: Context): Long = getNextAvailableId(context) - 1
 
   private fun getPrefs(context: Context): SharedPreferences {
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/add_access_control_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/add_access_control_dialog.xml
new file mode 100644
index 00000000000000..200b509e8c8e41
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/add_access_control_dialog.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_access_control_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <EditText
+      android:id="@+id/groupIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_group_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@+id/accessControlEntryTv"/>
+
+  <TextView
+      android:id="@+id/accessControlEntryTv"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_access_control_entry_text"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/groupIdEd"
+      app:layout_constraintBottom_toTopOf="@id/accessControlEntrySp"
+      />
+
+  <Spinner
+      android:id="@+id/accessControlEntrySp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/accessControlEntryTv"
+      app:layout_constraintBottom_toTopOf="@+id/addGroupDialogBtn"/>
+
+  <Button
+      android:id="@+id/addAccessControlBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/add_group_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/add_group_dialog.xml
new file mode 100644
index 00000000000000..29be8be0fa3e59
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/add_group_dialog.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_group_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <EditText
+      android:id="@+id/groupIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_group_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@+id/groupNameEd"/>
+
+  <EditText
+      android:id="@+id/groupNameEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_group_name_text"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/groupIdEd"
+      app:layout_constraintBottom_toTopOf="@+id/addGroupDialogBtn"/>
+
+  <Button
+      android:id="@+id/addGroupDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+
+  <Button
+      android:id="@+id/sendGroupDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_send_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/add_key_set_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/add_key_set_dialog.xml
new file mode 100644
index 00000000000000..8276c51a6fadcb
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/add_key_set_dialog.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_key_set_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <EditText
+      android:id="@+id/keySetIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_key_set_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@+id/policyTitleTv"/>
+
+  <TextView
+      android:id="@+id/policyTitleTv"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_key_policy_text"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/keySetIdEd"
+      app:layout_constraintBottom_toTopOf="@+id/keySecurityPolicySp" />
+
+  <Spinner
+      android:id="@+id/keySecurityPolicySp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/policyTitleTv"
+      app:layout_constraintBottom_toTopOf="@+id/validityTimeEd"/>
+
+  <EditText
+      android:id="@+id/validityTimeEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_validity_time_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/group_setting_validity_time_default_text"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/keySecurityPolicySp"
+      app:layout_constraintBottom_toTopOf="@+id/epochKeyEd"/>
+
+  <EditText
+      android:id="@+id/epochKeyEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_epoch_key_text"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/group_setting_epoch_key_default_text"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/validityTimeEd"
+      app:layout_constraintBottom_toTopOf="@+id/addKeySetDialogBtn"/>
+
+  <Button
+      android:id="@+id/addKeySetDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml
index 53d85ba9eb5144..c7883536078439 100644
--- a/examples/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml
+++ b/examples/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml
@@ -42,4 +42,22 @@
       android:layout_height="wrap_content"
       app:barrierDirection="bottom"
       app:constraint_referenced_ids="fabricIdEd,deviceIdEd,epIdEd" />
+
+    <TextView
+        android:id="@+id/deviceIdTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text = "@string/commissioned_device_id_text"
+        app:layout_constraintTop_toBottomOf="@id/fabricIdEd"
+        />
+
+    <Spinner
+        android:id="@+id/deviceIdSpinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/deviceIdTv" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/bind_key_set_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/bind_key_set_dialog.xml
new file mode 100644
index 00000000000000..31ced1f8135473
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/bind_key_set_dialog.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_bind_key_set_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <TextView
+      android:id="@+id/groupTv"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_group_text"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@id/groupSp" />
+
+  <Spinner
+      android:id="@+id/groupSp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/groupTv"
+      app:layout_constraintBottom_toTopOf="@id/keySetTv"/>
+
+  <TextView
+      android:id="@+id/keySetTv"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_key_text"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/groupSp"
+      app:layout_constraintBottom_toTopOf="@id/keySetSp" />
+
+  <Spinner
+      android:id="@+id/keySetSp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/keySetTv"
+      app:layout_constraintBottom_toTopOf="@id/bindKeySetDialogBtn"/>
+
+  <Button
+      android:id="@+id/bindKeySetDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_bind_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+
+  <Button
+      android:id="@+id/unbindKeySetDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_unbind_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/group_setting_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/group_setting_fragment.xml
new file mode 100644
index 00000000000000..c7267ff17985a3
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/group_setting_fragment.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/addressUpdateFragment"
+        android:name="com.google.chip.chiptool.clusterclient.AddressUpdateFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <Button
+        android:id="@+id/sendKeySetWriteBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/addressUpdateFragment"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/writeGroupKeyMapBtn"
+        android:text="@string/group_setting_send_key_set_write_text" />
+
+    <Button
+        android:id="@+id/writeGroupKeyMapBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/addressUpdateFragment"
+        app:layout_constraintStart_toEndOf="@id/sendKeySetWriteBtn"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/group_setting_write_group_key_map_text" />
+
+    <Button
+        android:id="@+id/sendAddGroupBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/sendKeySetWriteBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/addAccessControlBtn"
+        android:text="@string/group_setting_send_add_group_text" />
+
+    <Button
+        android:id="@+id/addAccessControlBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/writeGroupKeyMapBtn"
+        app:layout_constraintStart_toEndOf="@id/sendAddGroupBtn"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/group_setting_add_access_control_text" />
+
+    <TextView
+        android:id="@+id/groupSettingStatusTv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        app:layout_constraintTop_toBottomOf="@id/addAccessControlBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:singleLine="true"
+        android:minLines="1"
+        android:textSize="12sp"/>
+
+    <Button
+        android:id="@+id/addGroupBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/groupSettingStatusTv"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/removeGroupBtn"
+        android:text="@string/group_setting_add_group_text" />
+
+    <Button
+        android:id="@+id/removeGroupBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/groupSettingStatusTv"
+        app:layout_constraintStart_toEndOf="@id/addGroupBtn"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/group_setting_remove_group_text" />
+
+    <Button
+        android:id="@+id/addkeysetBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/addGroupBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/removekeysetBtn"
+        android:text="@string/group_setting_add_key_set_text" />
+
+    <Button
+        android:id="@+id/removekeysetBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/addGroupBtn"
+        app:layout_constraintStart_toEndOf="@id/addkeysetBtn"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/group_setting_remove_key_set_text" />
+
+    <Button
+        android:id="@+id/bindkeysetBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/addkeysetBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/unbindkeysetBtn"
+        android:text="@string/group_setting_bind_key_set_text" />
+
+    <Button
+        android:id="@+id/unbindkeysetBtn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/addkeysetBtn"
+        app:layout_constraintStart_toEndOf="@id/bindkeysetBtn"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/group_setting_unbind_key_set_text" />
+
+    <TextView
+        android:id="@+id/multiAdminClusterCommandStatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        app:layout_constraintTop_toBottomOf="@id/bindkeysetBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:singleLine="false"
+        android:minLines="4"
+        android:textSize="20sp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/remove_group_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/remove_group_dialog.xml
new file mode 100644
index 00000000000000..18c4d0be5d46ab
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/remove_group_dialog.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_remove_group_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <TextView
+      android:id="@+id/groupListTv"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_group_text"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      />
+
+  <Spinner
+      android:id="@+id/groupListSp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/groupListTv"
+      app:layout_constraintBottom_toTopOf="@+id/removeGroupDialogBtn"/>
+
+  <Button
+      android:id="@+id/removeGroupDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_remove_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/remove_key_set_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/remove_key_set_dialog.xml
new file mode 100644
index 00000000000000..51503f8ce8eeee
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/remove_key_set_dialog.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_remove_key_set_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <TextView
+      android:id="@+id/keySetListTv"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_key_set_text"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      />
+
+  <Spinner
+      android:id="@+id/keySetListSp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/keySetListTv"
+      app:layout_constraintBottom_toTopOf="@+id/removeGroupDialogBtn"/>
+
+  <Button
+      android:id="@+id/removeGroupDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_remove_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
index cfc6b90be5853b..bc79784b383b7a 100644
--- a/examples/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
+++ b/examples/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
@@ -112,6 +112,14 @@
             android:layout_marginTop="8dp"
             android:text="@string/unpair_device_btn_text" />
 
+        <Button
+            android:id="@+id/groupSettingBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/group_setting_btn_text" />
+
     </LinearLayout>
 
 </ScrollView>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/send_key_set_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/send_key_set_dialog.xml
new file mode 100644
index 00000000000000..3a557bb47043db
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/send_key_set_dialog.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_send_key_set_write_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <EditText
+      android:id="@+id/keySetIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_key_set_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@id/policyTitleTv"/>
+
+  <TextView
+      android:id="@+id/policyTitleTv"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_key_policy_text"
+      android:textSize="16sp"
+      android:layout_marginTop="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/keySetIdEd"
+      app:layout_constraintBottom_toTopOf="@id/keySecurityPolicySp" />
+
+  <Spinner
+      android:id="@+id/keySecurityPolicySp"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:spinnerMode="dropdown"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/policyTitleTv"
+      app:layout_constraintBottom_toTopOf="@id/epochKey0Ed"/>
+
+  <EditText
+      android:id="@+id/epochKey0Ed"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_epoch_key_text"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/group_setting_epoch_key_default_text"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/keySecurityPolicySp"
+      app:layout_constraintBottom_toTopOf="@id/epochStartTime0Ed"/>
+
+  <EditText
+      android:id="@+id/epochStartTime0Ed"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_validity_time_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/group_setting_validity_time_default_text"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/epochKey0Ed"
+      app:layout_constraintBottom_toTopOf="@id/epochKey1Ed"/>
+
+  <EditText
+      android:id="@+id/epochKey1Ed"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_epoch_key_text"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/group_setting_epoch_key_default_text"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/epochStartTime0Ed"
+      app:layout_constraintBottom_toTopOf="@id/epochStartTime1Ed"/>
+
+  <EditText
+      android:id="@+id/epochStartTime1Ed"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_validity_time_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/group_setting_validity_time_default1_text"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/epochKey1Ed"
+      app:layout_constraintBottom_toTopOf="@id/epochKey2Ed"/>
+
+  <EditText
+      android:id="@+id/epochKey2Ed"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_epoch_key_text"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/group_setting_epoch_key_default_text"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/epochStartTime1Ed"
+      app:layout_constraintBottom_toTopOf="@id/epochStartTime2Ed"/>
+
+  <EditText
+      android:id="@+id/epochStartTime2Ed"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_validity_time_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/group_setting_validity_time_default2_text"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/epochKey2Ed"
+      app:layout_constraintBottom_toTopOf="@id/addKeySetDialogBtn"/>
+
+  <Button
+      android:id="@+id/addKeySetDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/set_key_write_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/set_key_write_dialog.xml
new file mode 100644
index 00000000000000..b09bfa29cb0008
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/set_key_write_dialog.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_group_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <EditText
+      android:id="@+id/groupIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_group_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@+id/groupNameEd"/>
+
+  <EditText
+      android:id="@+id/groupNameEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_group_name_text"
+      android:inputType="text"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/groupIdEd"
+      app:layout_constraintBottom_toTopOf="@+id/addGroupDialogBtn"/>
+
+  <Button
+      android:id="@+id/addGroupDialogBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_add_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/write_group_key_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/write_group_key_dialog.xml
new file mode 100644
index 00000000000000..8c00cec68cbe3b
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/write_group_key_dialog.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_write_group_key_map_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <EditText
+      android:id="@+id/groupIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_group_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@id/groupKeySetIdEd"/>
+
+  <EditText
+      android:id="@+id/groupKeySetIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/group_setting_group_key_set_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/groupIdEd"
+      app:layout_constraintBottom_toTopOf="@id/writeGroupKeyMapBtn"/>
+
+  <Button
+      android:id="@+id/writeGroupKeyMapBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_write_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
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 c786bbdf1aa3a5..205a60a16515d4 100644
--- a/examples/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="enter_endpoint_id_hint_text">Enter Endpoint ID</string>
     <string name="update_device_address_btn_text">Update address</string>
     <string name="update_device_address_failure">Device address update failed: %1$s</string>
+    <string name="commissioned_device_id_text">Commissioned Device ID :</string>
 
     <string name="address_commissioning_title_text">Commission with IP address</string>
     <string name="default_discriminator">3840</string>
@@ -219,4 +220,38 @@
     <string name="wifi_connect_btn_text">Connect</string>
 
     <string name="unpair_device_btn_text">Unpair</string>
+
+    <string name="group_setting_btn_text">Group Setting</string>
+    <string name="group_setting_group_text">Group :</string>
+    <string name="group_setting_key_text">Key :</string>
+    <string name="group_setting_send_key_set_write_text">Send KeySetWrite</string>
+    <string name="group_setting_write_group_key_map_text">Write GroupKey</string>
+    <string name="group_setting_group_key_set_id_text">GroupKeySetID</string>
+    <string name="group_setting_key_set_text">Key Set</string>
+    <string name="group_setting_group_key_text">GroupKey</string>
+    <string name="group_setting_send_add_group_text">Send AddGroup</string>
+    <string name="group_setting_add_access_control_text">Add Acl</string>
+    <string name="group_setting_add_group_text">Add Group</string>
+    <string name="group_setting_remove_group_text">Remove Group</string>
+    <string name="group_setting_add_key_set_text">Add KeySet</string>
+    <string name="group_setting_remove_key_set_text">remove KeySet</string>
+    <string name="group_setting_bind_key_set_text">Bind KeySet</string>
+    <string name="group_setting_unbind_key_set_text">Unbind KeySet</string>
+    <string name="group_setting_group_id_text">Group ID</string>
+    <string name="group_setting_group_name_text">Group Name</string>
+    <string name="group_setting_key_set_id_text">Key Set ID</string>
+    <string name="group_setting_key_policy_text">Key Policy</string>
+    <string name="group_setting_validity_time_text">Validity Time</string>
+    <string name="group_setting_validity_time_default_text">2220000</string>
+    <string name="group_setting_validity_time_default1_text">2220001</string>
+    <string name="group_setting_validity_time_default2_text">2220002</string>
+    <string name="group_setting_epoch_key_text">Epoch Key</string>
+    <string name="group_setting_epoch_key_default_text">d0d1d2d3d4d5d6d7d8d9dadbdcdddedf</string>
+    <string name="group_setting_access_control_entry_text">Access Control Entry :</string>
+    <string name="group_setting_add_btn_text">Add</string>
+    <string name="group_setting_remove_btn_text">Remove</string>
+    <string name="group_setting_bind_btn_text">Bind</string>
+    <string name="group_setting_unbind_btn_text">Unbind</string>
+    <string name="group_setting_send_btn_text">Send</string>
+    <string name="group_setting_write_btn_text">Write</string>
 </resources>
diff --git a/kotlin-detect-config.yaml b/kotlin-detect-config.yaml
index 3af04f5b389369..165bd85bec2917 100644
--- a/kotlin-detect-config.yaml
+++ b/kotlin-detect-config.yaml
@@ -273,6 +273,7 @@ complexity:
         excludes:
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt"
+            - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt"
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index ab3e972b62ec80..a83ca98fca5f3d 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -191,6 +191,16 @@ class DLL_EXPORT DeviceController : public AbstractDnssdDiscoveryController
         return nullptr;
     }
 
+    Messaging::ExchangeManager * ExchangeMgr()
+    {
+        if (mSystemState != nullptr)
+        {
+            return mSystemState->ExchangeMgr();
+        }
+
+        return nullptr;
+    }
+
     CHIP_ERROR GetPeerAddressAndPort(NodeId peerId, Inet::IPAddress & addr, uint16_t & port);
 
     /**
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index 52c836c7d24fdd..53df84ac7302fd 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -206,6 +206,7 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(
         *errInfoOnFailure = err;
         return nullptr;
     }
+    chip::Credentials::SetGroupDataProvider(&wrapper->mGroupDataProvider);
     initParams.groupDataProvider = &wrapper->mGroupDataProvider;
 
     err = wrapper->mOpCertStore.Init(wrapperStorage);
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 8e91dc190ddb64..0eb1bd9141a8ac 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -402,6 +402,7 @@ android_library("java") {
     "src/chip/devicecontroller/DeviceAttestationDelegate.java",
     "src/chip/devicecontroller/DiscoveredDevice.java",
     "src/chip/devicecontroller/GetConnectedDeviceCallbackJni.java",
+    "src/chip/devicecontroller/GroupKeySecurityPolicy.java",
     "src/chip/devicecontroller/InvokeCallback.java",
     "src/chip/devicecontroller/InvokeCallbackJni.java",
     "src/chip/devicecontroller/KeypairDelegate.java",
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index 8bedec602381e0..16c69e9f14d6aa 100644
--- a/src/controller/java/CHIPDeviceController-JNI.cpp
+++ b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -39,6 +39,7 @@
 #include <controller/CHIPDeviceController.h>
 #include <controller/CommissioningWindowOpener.h>
 #include <controller/java/AndroidClusterExceptions.h>
+#include <controller/java/GroupDeviceProxy.h>
 #include <credentials/CHIPCert.h>
 #include <jni.h>
 #include <lib/support/CHIPMem.h>
@@ -1281,6 +1282,354 @@ JNI_METHOD(void, releaseOperationalDevicePointer)(JNIEnv * env, jobject self, jl
     }
 }
 
+JNI_METHOD(jlong, getGroupDevicePointer)(JNIEnv * env, jobject self, jlong handle, jint groupId)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, 0, ChipLogError(Controller, "wrapper is null"));
+
+    GroupDeviceProxy * device = new GroupDeviceProxy(static_cast<GroupId>(groupId), wrapper->Controller()->GetFabricIndex(),
+                                                     wrapper->Controller()->ExchangeMgr());
+
+    if (device == nullptr)
+    {
+        CHIP_ERROR err = CHIP_ERROR_NO_MEMORY;
+        ChipLogError(Controller, "GroupDeviceProxy handle is nullptr: %s", ErrorStr(err));
+        JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
+        return 0;
+    }
+
+    return reinterpret_cast<jlong>(device);
+}
+
+JNI_METHOD(void, releaseGroupDevicePointer)(JNIEnv * env, jobject self, jlong devicePtr)
+{
+    chip::DeviceLayer::StackLock lock;
+    GroupDeviceProxy * device = reinterpret_cast<GroupDeviceProxy *>(devicePtr);
+    if (device != NULL)
+    {
+        delete device;
+    }
+}
+
+JNI_METHOD(jobject, getAvailableGroupIds)(JNIEnv * env, jobject self, jlong handle)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, nullptr, ChipLogError(Controller, "wrapper is null"));
+
+    CHIP_ERROR err                                           = CHIP_NO_ERROR;
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    auto it = groupDataProvider->IterateGroupInfo(wrapper->Controller()->GetFabricIndex());
+
+    jobject groupIds;
+    err = chip::JniReferences::GetInstance().CreateArrayList(groupIds);
+
+    chip::Credentials::GroupDataProvider::GroupInfo group;
+
+    if (it)
+    {
+        while (it->Next(group))
+        {
+            jobject jGroupId;
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                       static_cast<jint>(group.group_id), jGroupId);
+            chip::JniReferences::GetInstance().AddToList(groupIds, jGroupId);
+        }
+    }
+
+    return groupIds;
+}
+
+JNI_METHOD(jstring, getGroupName)(JNIEnv * env, jobject self, jlong handle, jint jGroupId)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, nullptr, ChipLogError(Controller, "wrapper is null"));
+
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    auto it = groupDataProvider->IterateGroupInfo(wrapper->Controller()->GetFabricIndex());
+
+    GroupId groupId = static_cast<GroupId>(jGroupId);
+    chip::Credentials::GroupDataProvider::GroupInfo group;
+
+    if (it)
+    {
+        while (it->Next(group))
+        {
+            if (group.group_id == groupId)
+            {
+                return env->NewStringUTF(group.name);
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+JNI_METHOD(jobject, findKeySetId)(JNIEnv * env, jobject self, jlong handle, jint jGroupId)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, nullptr, ChipLogError(Controller, "wrapper is null"));
+
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    auto iter = groupDataProvider->IterateGroupKeys(wrapper->Controller()->GetFabricIndex());
+    chip::Credentials::GroupDataProvider::GroupKey groupKey;
+    GroupId groupId = static_cast<GroupId>(jGroupId);
+    jobject wrapperKeyId;
+
+    if (iter)
+    {
+        while (iter->Next(groupKey))
+        {
+            if (groupKey.group_id == groupId)
+            {
+                jobject jKeyId;
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                           static_cast<jint>(groupKey.keyset_id), jKeyId);
+                chip::JniReferences::GetInstance().CreateOptional(jKeyId, wrapperKeyId);
+                iter->Release();
+                return wrapperKeyId;
+            }
+        }
+        iter->Release();
+    }
+    chip::JniReferences::GetInstance().CreateOptional(nullptr, wrapperKeyId);
+    return wrapperKeyId;
+}
+
+JNI_METHOD(jboolean, addGroup)(JNIEnv * env, jobject self, jlong handle, jint jGroupId, jstring groupName)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, JNI_FALSE, ChipLogError(Controller, "wrapper is null"));
+
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    chip::Credentials::GroupDataProvider::GroupInfo group;
+
+    chip::JniUtfString jniGroupName(env, groupName);
+    group.SetName(jniGroupName.charSpan());
+    group.group_id = static_cast<GroupId>(jGroupId);
+
+    CHIP_ERROR err = groupDataProvider->SetGroupInfo(wrapper->Controller()->GetFabricIndex(), group);
+
+    return err == CHIP_NO_ERROR ? JNI_TRUE : JNI_FALSE;
+}
+
+JNI_METHOD(jboolean, removeGroup)(JNIEnv * env, jobject self, jlong handle, jint jGroupId)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, JNI_FALSE, ChipLogError(Controller, "wrapper is null"));
+
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    CHIP_ERROR err = groupDataProvider->RemoveGroupInfo(wrapper->Controller()->GetFabricIndex(), static_cast<GroupId>(jGroupId));
+
+    return err == CHIP_NO_ERROR ? JNI_TRUE : JNI_FALSE;
+}
+
+JNI_METHOD(jobject, getKeySetIds)(JNIEnv * env, jobject self, jlong handle)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, nullptr, ChipLogError(Controller, "wrapper is null"));
+
+    CHIP_ERROR err                                           = CHIP_NO_ERROR;
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    auto it = groupDataProvider->IterateKeySets(wrapper->Controller()->GetFabricIndex());
+
+    jobject keySetIds;
+    err = chip::JniReferences::GetInstance().CreateArrayList(keySetIds);
+
+    chip::Credentials::GroupDataProvider::KeySet keySet;
+
+    if (it)
+    {
+        while (it->Next(keySet))
+        {
+            jobject jKeySetId;
+            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                       static_cast<jint>(keySet.keyset_id), jKeySetId);
+            chip::JniReferences::GetInstance().AddToList(keySetIds, jKeySetId);
+        }
+        it->Release();
+    }
+
+    return keySetIds;
+}
+
+JNI_METHOD(jobject, getKeySecurityPolicy)(JNIEnv * env, jobject self, jlong handle, int jKeySetId)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, nullptr, ChipLogError(Controller, "wrapper is null"));
+
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    auto it = groupDataProvider->IterateKeySets(wrapper->Controller()->GetFabricIndex());
+
+    chip::Credentials::GroupDataProvider::KeySet keySet;
+
+    uint16_t keySetId = static_cast<uint16_t>(jKeySetId);
+    jobject wrapperKeyPolicy;
+
+    if (it)
+    {
+        while (it->Next(keySet))
+        {
+            if (keySet.keyset_id == keySetId)
+            {
+                jobject jKeyPolicy;
+                chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                           static_cast<jint>(keySet.policy), jKeyPolicy);
+                chip::JniReferences::GetInstance().CreateOptional(jKeyPolicy, wrapperKeyPolicy);
+                it->Release();
+                return wrapperKeyPolicy;
+            }
+        }
+        it->Release();
+    }
+    chip::JniReferences::GetInstance().CreateOptional(nullptr, wrapperKeyPolicy);
+    return wrapperKeyPolicy;
+}
+
+JNI_METHOD(jboolean, bindKeySet)(JNIEnv * env, jobject self, jlong handle, jint jGroupId, jint jKeySetId)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, JNI_FALSE, ChipLogError(Controller, "wrapper is null"));
+
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    auto iter            = groupDataProvider->IterateGroupKeys(wrapper->Controller()->GetFabricIndex());
+    size_t current_count = iter->Count();
+
+    iter->Release();
+    CHIP_ERROR err = groupDataProvider->SetGroupKeyAt(
+        wrapper->Controller()->GetFabricIndex(), current_count,
+        chip::Credentials::GroupDataProvider::GroupKey(static_cast<uint16_t>(jGroupId), static_cast<uint16_t>(jKeySetId)));
+    return err == CHIP_NO_ERROR ? JNI_TRUE : JNI_FALSE;
+}
+
+JNI_METHOD(jboolean, unbindKeySet)(JNIEnv * env, jobject self, jlong handle, jint jGroupId, jint jKeySetId)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, JNI_FALSE, ChipLogError(Controller, "wrapper is null"));
+
+    size_t index                                             = 0;
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    auto iter       = groupDataProvider->IterateGroupKeys(wrapper->Controller()->GetFabricIndex());
+    size_t maxCount = iter->Count();
+    chip::Credentials::GroupDataProvider::GroupKey groupKey;
+
+    GroupId groupId   = static_cast<GroupId>(jGroupId);
+    uint16_t keysetId = static_cast<uint16_t>(jKeySetId);
+
+    while (iter->Next(groupKey))
+    {
+        if (groupKey.group_id == groupId && groupKey.keyset_id == keysetId)
+        {
+            break;
+        }
+        index++;
+    }
+    iter->Release();
+    if (index >= maxCount)
+    {
+        return JNI_FALSE;
+    }
+
+    CHIP_ERROR err = groupDataProvider->RemoveGroupKeyAt(wrapper->Controller()->GetFabricIndex(), index);
+
+    return err == CHIP_NO_ERROR ? JNI_TRUE : JNI_FALSE;
+}
+
+JNI_METHOD(jboolean, addKeySet)
+(JNIEnv * env, jobject self, jlong handle, jint jKeySetId, jint jKeyPolicy, jlong validityTime, jbyteArray epochKey)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, JNI_FALSE, ChipLogError(Controller, "wrapper is null"));
+
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+    uint8_t compressed_fabric_id[sizeof(chip::FabricId)];
+    chip::MutableByteSpan compressed_fabric_id_span(compressed_fabric_id);
+    VerifyOrReturnValue(wrapper->Controller()->GetCompressedFabricIdBytes(compressed_fabric_id_span) == CHIP_NO_ERROR, JNI_FALSE);
+
+    chip::Credentials::GroupDataProvider::SecurityPolicy keyPolicy =
+        static_cast<chip::Credentials::GroupDataProvider::SecurityPolicy>(jKeyPolicy);
+    chip::JniByteArray jniEpochKey(env, epochKey);
+    size_t epochKeySize = static_cast<size_t>(jniEpochKey.size());
+    if ((keyPolicy != chip::Credentials::GroupDataProvider::SecurityPolicy::kCacheAndSync &&
+         keyPolicy != chip::Credentials::GroupDataProvider::SecurityPolicy::kTrustFirst) ||
+        epochKeySize != chip::Credentials::GroupDataProvider::EpochKey::kLengthBytes)
+    {
+        return JNI_FALSE;
+    }
+
+    chip::Credentials::GroupDataProvider::KeySet keySet(static_cast<uint16_t>(jKeySetId), keyPolicy, 1);
+    chip::Credentials::GroupDataProvider::EpochKey epoch_key;
+    epoch_key.start_time = static_cast<uint64_t>(validityTime);
+    memcpy(epoch_key.key, jniEpochKey.byteSpan().data(), chip::Credentials::GroupDataProvider::EpochKey::kLengthBytes);
+    memcpy(keySet.epoch_keys, &epoch_key, sizeof(chip::Credentials::GroupDataProvider::EpochKey));
+
+    VerifyOrReturnValue(groupDataProvider->SetKeySet(wrapper->Controller()->GetFabricIndex(), compressed_fabric_id_span, keySet) ==
+                            CHIP_NO_ERROR,
+                        JNI_FALSE);
+
+    return JNI_TRUE;
+}
+
+JNI_METHOD(jboolean, removeKeySet)(JNIEnv * env, jobject self, jlong handle, jint jKeySetId)
+{
+    chip::DeviceLayer::StackLock lock;
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    VerifyOrReturnValue(wrapper != nullptr, JNI_FALSE, ChipLogError(Controller, "wrapper is null"));
+
+    CHIP_ERROR err                                           = CHIP_NO_ERROR;
+    chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
+
+    size_t index      = 0;
+    auto iter         = groupDataProvider->IterateGroupKeys(wrapper->Controller()->GetFabricIndex());
+    uint16_t keysetId = static_cast<uint16_t>(jKeySetId);
+    chip::Credentials::GroupDataProvider::GroupKey groupKey;
+    if (iter)
+    {
+        while (iter->Next(groupKey))
+        {
+            if (groupKey.keyset_id == keysetId)
+            {
+                err = groupDataProvider->RemoveGroupKeyAt(wrapper->Controller()->GetFabricIndex(), index);
+                if (err != CHIP_NO_ERROR)
+                {
+                    break;
+                }
+            }
+            index++;
+        }
+        iter->Release();
+        if (err == CHIP_NO_ERROR)
+        {
+            err = groupDataProvider->RemoveKeySet(wrapper->Controller()->GetFabricIndex(), keysetId);
+        }
+        return err == CHIP_NO_ERROR ? JNI_TRUE : JNI_FALSE;
+    }
+
+    return JNI_FALSE;
+}
+
 JNI_METHOD(jint, getFabricIndex)(JNIEnv * env, jobject self, jlong handle)
 {
     chip::DeviceLayer::StackLock lock;
@@ -1946,6 +2295,8 @@ JNI_METHOD(void, write)
         bool hasDataVersion               = false;
         Optional<DataVersion> dataVersion = Optional<DataVersion>();
 
+        bool isGroupSession = false;
+
         SuccessOrExit(err = JniReferences::GetInstance().GetListItem(attributeList, i, attributeItem));
         SuccessOrExit(err = JniReferences::GetInstance().FindMethod(
                           env, attributeItem, "getEndpointId", "()Lchip/devicecontroller/model/ChipPathId;", &getEndpointIdMethod));
@@ -1961,9 +2312,20 @@ JNI_METHOD(void, write)
         SuccessOrExit(
             err = JniReferences::GetInstance().FindMethod(env, attributeItem, "getTlvByteArray", "()[B", &getTlvByteArrayMethod));
 
-        endpointIdObj = env->CallObjectMethod(attributeItem, getEndpointIdMethod);
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-        VerifyOrExit(endpointIdObj != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
+        isGroupSession = device->GetSecureSession().Value()->IsGroupSession();
+
+        if (isGroupSession)
+        {
+            endpointId = kInvalidEndpointId;
+        }
+        else
+        {
+            endpointIdObj = env->CallObjectMethod(attributeItem, getEndpointIdMethod);
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+            VerifyOrExit(endpointIdObj != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+            SuccessOrExit(err = GetChipPathIdValue(endpointIdObj, kInvalidEndpointId, endpointId));
+        }
 
         clusterIdObj = env->CallObjectMethod(attributeItem, getClusterIdMethod);
         VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
@@ -1973,7 +2335,6 @@ JNI_METHOD(void, write)
         VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
         VerifyOrExit(attributeIdObj != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
 
-        SuccessOrExit(err = GetChipPathIdValue(endpointIdObj, kInvalidEndpointId, endpointId));
         SuccessOrExit(err = GetChipPathIdValue(clusterIdObj, kInvalidClusterId, clusterId));
         SuccessOrExit(err = GetChipPathIdValue(attributeIdObj, kInvalidAttributeId, attributeId));
 
@@ -2068,14 +2429,21 @@ JNI_METHOD(void, invoke)
     uint32_t endpointId                     = 0;
     uint32_t clusterId                      = 0;
     uint32_t commandId                      = 0;
+    uint16_t groupId                        = 0;
+    bool isEndpointIdValid                  = false;
+    bool isGroupIdValid                     = false;
     jmethodID getEndpointIdMethod           = nullptr;
     jmethodID getClusterIdMethod            = nullptr;
     jmethodID getCommandIdMethod            = nullptr;
+    jmethodID getGroupIdMethod              = nullptr;
     jmethodID getTlvByteArrayMethod         = nullptr;
     jmethodID getJsonStringMethod           = nullptr;
+    jmethodID isEndpointIdValidMethod       = nullptr;
+    jmethodID isGroupIdValidMethod          = nullptr;
     jobject endpointIdObj                   = nullptr;
     jobject clusterIdObj                    = nullptr;
     jobject commandIdObj                    = nullptr;
+    jobject groupIdObj                      = nullptr;
     jbyteArray tlvBytesObj                  = nullptr;
     uint16_t convertedTimedRequestTimeoutMs = static_cast<uint16_t>(timedRequestTimeoutMs);
     ChipLogDetail(Controller, "IM invoke() called");
@@ -2092,12 +2460,40 @@ JNI_METHOD(void, invoke)
                                                                 "()Lchip/devicecontroller/model/ChipPathId;", &getClusterIdMethod));
     SuccessOrExit(err = JniReferences::GetInstance().FindMethod(env, invokeElement, "getCommandId",
                                                                 "()Lchip/devicecontroller/model/ChipPathId;", &getCommandIdMethod));
+    SuccessOrExit(err = JniReferences::GetInstance().FindMethod(env, invokeElement, "getGroupId", "()Ljava/util/Optional;",
+                                                                &getGroupIdMethod));
+    SuccessOrExit(
+        err = JniReferences::GetInstance().FindMethod(env, invokeElement, "isEndpointIdValid", "()Z", &isEndpointIdValidMethod));
+    SuccessOrExit(err =
+                      JniReferences::GetInstance().FindMethod(env, invokeElement, "isGroupIdValid", "()Z", &isGroupIdValidMethod));
     SuccessOrExit(
         err = JniReferences::GetInstance().FindMethod(env, invokeElement, "getTlvByteArray", "()[B", &getTlvByteArrayMethod));
 
-    endpointIdObj = env->CallObjectMethod(invokeElement, getEndpointIdMethod);
-    VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-    VerifyOrExit(endpointIdObj != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
+    isEndpointIdValid = (env->CallBooleanMethod(invokeElement, isEndpointIdValidMethod) == JNI_TRUE);
+    isGroupIdValid    = (env->CallBooleanMethod(invokeElement, isGroupIdValidMethod) == JNI_TRUE);
+
+    if (isEndpointIdValid)
+    {
+        endpointIdObj = env->CallObjectMethod(invokeElement, getEndpointIdMethod);
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        VerifyOrExit(endpointIdObj != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+        SuccessOrExit(err = GetChipPathIdValue(endpointIdObj, kInvalidEndpointId, endpointId));
+    }
+
+    if (isGroupIdValid)
+    {
+        VerifyOrExit(device->GetSecureSession().Value()->IsGroupSession(), err = CHIP_ERROR_INVALID_ARGUMENT);
+        groupIdObj = env->CallObjectMethod(invokeElement, getGroupIdMethod);
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        VerifyOrExit(groupIdObj != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+        jobject boxedGroupId = nullptr;
+
+        SuccessOrExit(err = JniReferences::GetInstance().GetOptionalValue(groupIdObj, boxedGroupId));
+        VerifyOrExit(boxedGroupId != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
+        groupId = static_cast<uint16_t>(JniReferences::GetInstance().IntegerToPrimitive(boxedGroupId));
+    }
 
     clusterIdObj = env->CallObjectMethod(invokeElement, getClusterIdMethod);
     VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
@@ -2107,15 +2503,16 @@ JNI_METHOD(void, invoke)
     VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
     VerifyOrExit(commandIdObj != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
 
-    SuccessOrExit(err = GetChipPathIdValue(endpointIdObj, kInvalidEndpointId, endpointId));
     SuccessOrExit(err = GetChipPathIdValue(clusterIdObj, kInvalidClusterId, clusterId));
     SuccessOrExit(err = GetChipPathIdValue(commandIdObj, kInvalidCommandId, commandId));
 
     tlvBytesObj = static_cast<jbyteArray>(env->CallObjectMethod(invokeElement, getTlvByteArrayMethod));
     VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
     {
-        app::CommandPathParams path(static_cast<EndpointId>(endpointId), /* group id */ 0, static_cast<ClusterId>(clusterId),
-                                    static_cast<CommandId>(commandId), app::CommandPathFlags::kEndpointIdValid);
+        uint16_t id = isEndpointIdValid ? static_cast<uint16_t>(endpointId) : groupId;
+        app::CommandPathFlags flag =
+            isEndpointIdValid ? app::CommandPathFlags::kEndpointIdValid : app::CommandPathFlags::kGroupIdValid;
+        app::CommandPathParams path(id, static_cast<ClusterId>(clusterId), static_cast<CommandId>(commandId), flag);
         if (tlvBytesObj != nullptr)
         {
             JniByteArray tlvBytesObjBytes(env, tlvBytesObj);
@@ -2139,10 +2536,13 @@ JNI_METHOD(void, invoke)
     SuccessOrExit(err = commandSender->FinishCommand(convertedTimedRequestTimeoutMs != 0
                                                          ? Optional<uint16_t>(convertedTimedRequestTimeoutMs)
                                                          : Optional<uint16_t>::Missing()));
-    SuccessOrExit(err =
-                      commandSender->SendCommandRequest(device->GetSecureSession().Value(),
-                                                        imTimeoutMs != 0 ? MakeOptional(System::Clock::Milliseconds32(imTimeoutMs))
-                                                                         : Optional<System::Clock::Timeout>::Missing()));
+
+    SuccessOrExit(err = device->GetSecureSession().Value()->IsGroupSession()
+                      ? commandSender->SendGroupCommandRequest(device->GetSecureSession().Value())
+                      : commandSender->SendCommandRequest(device->GetSecureSession().Value(),
+                                                          imTimeoutMs != 0
+                                                              ? MakeOptional(System::Clock::Milliseconds32(imTimeoutMs))
+                                                              : Optional<System::Clock::Timeout>::Missing()));
 
     callback->mCommandSender = commandSender;
 
diff --git a/src/controller/java/GroupDeviceProxy.h b/src/controller/java/GroupDeviceProxy.h
new file mode 100644
index 00000000000000..f329055d59b530
--- /dev/null
+++ b/src/controller/java/GroupDeviceProxy.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <app/DeviceProxy.h>
+#include <lib/core/GroupId.h>
+#include <messaging/ExchangeMgr.h>
+#include <transport/SessionManager.h>
+
+namespace chip {
+
+class GroupDeviceProxy : public DeviceProxy
+{
+public:
+    GroupDeviceProxy(GroupId groupId, FabricIndex fabricIndex, Messaging::ExchangeManager * exchangeMgr) :
+        mGroupId(groupId), mExchangeMgr(exchangeMgr)
+    {
+        chip::Transport::OutgoingGroupSession * session = new chip::Transport::OutgoingGroupSession(groupId, fabricIndex);
+        mSecureSession                                  = chip::SessionHandle(*session);
+    }
+    GroupDeviceProxy() {}
+
+    void Disconnect() override {}
+
+    Messaging::ExchangeManager * GetExchangeManager() const override { return mExchangeMgr; }
+    chip::Optional<SessionHandle> GetSecureSession() const override { return mSecureSession.Get(); }
+    NodeId GetDeviceId() const override { return NodeIdFromGroupId(mGroupId); }
+
+private:
+    bool IsSecureConnected() const override { return static_cast<bool>(mSecureSession); }
+
+    GroupId mGroupId                          = chip::kUndefinedGroupId;
+    Messaging::ExchangeManager * mExchangeMgr = nullptr;
+    SessionHolder mSecureSession;
+};
+
+} // namespace chip
diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
index 5a005a219af7a8..6f14e5ea584df2 100644
--- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
+++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
@@ -344,6 +344,58 @@ public void releaseConnectedDevicePointer(long devicePtr) {
     releaseOperationalDevicePointer(devicePtr);
   }
 
+  public long getGroupDevicePointer(int groupId) {
+    return getGroupDevicePointer(deviceControllerPtr, groupId);
+  }
+
+  public native void releaseGroupDevicePointer(long devicePtr);
+
+  public List<Integer> getAvailableGroupIds() {
+    return getAvailableGroupIds(deviceControllerPtr);
+  }
+
+  public String getGroupName(int groupId) {
+    return getGroupName(deviceControllerPtr, groupId);
+  }
+
+  public Optional<Integer> findKeySetId(int groupId) {
+    return findKeySetId(deviceControllerPtr, groupId);
+  }
+
+  public boolean addGroup(int groupId, String groupName) {
+    return addGroup(deviceControllerPtr, groupId, groupName);
+  }
+
+  public boolean removeGroup(int groupId) {
+    return removeGroup(deviceControllerPtr, groupId);
+  }
+
+  public List<Integer> getKeySetIds() {
+    return getKeySetIds(deviceControllerPtr);
+  }
+
+  public Optional<GroupKeySecurityPolicy> getKeySecurityPolicy(int keySetId) {
+    return getKeySecurityPolicy(deviceControllerPtr, keySetId)
+        .map(id -> GroupKeySecurityPolicy.value(id));
+  }
+
+  public boolean bindKeySet(int groupId, int keySetId) {
+    return bindKeySet(deviceControllerPtr, groupId, keySetId);
+  }
+
+  public boolean unbindKeySet(int groupId, int keySetId) {
+    return unbindKeySet(deviceControllerPtr, groupId, keySetId);
+  }
+
+  public boolean addKeySet(
+      int keySetId, GroupKeySecurityPolicy keyPolicy, long validityTime, byte[] epochKey) {
+    return addKeySet(deviceControllerPtr, keySetId, keyPolicy.getID(), validityTime, epochKey);
+  }
+
+  public boolean removeKeySet(int keySetId) {
+    return removeKeySet(deviceControllerPtr, keySetId);
+  }
+
   public void onConnectDeviceComplete() {
     completionListener.onConnectDeviceComplete();
   }
@@ -1153,6 +1205,31 @@ private native void getConnectedDevicePointer(
 
   private native void releaseOperationalDevicePointer(long devicePtr);
 
+  private native long getGroupDevicePointer(long deviceControllerPtr, int groupId);
+
+  private native List<Integer> getAvailableGroupIds(long deviceControllerPtr);
+
+  private native String getGroupName(long deviceControllerPtr, int groupId);
+
+  private native Optional<Integer> findKeySetId(long deviceControllerPtr, int groupId);
+
+  private native boolean addGroup(long deviceControllerPtr, int groupId, String groupName);
+
+  private native boolean removeGroup(long deviceControllerPtr, int groupId);
+
+  private native List<Integer> getKeySetIds(long deviceControllerPtr);
+
+  private native Optional<Integer> getKeySecurityPolicy(long deviceControllerPtr, int keySetId);
+
+  private native boolean bindKeySet(long deviceControllerPtr, int groupId, int keySetId);
+
+  private native boolean unbindKeySet(long deviceControllerPtr, int groupId, int keySetId);
+
+  private native boolean addKeySet(
+      long deviceControllerPtr, int keySetId, int keyPolicy, long validityTime, byte[] epochKey);
+
+  private native boolean removeKeySet(long deviceControllerPtr, int keySetId);
+
   private native void deleteDeviceController(long deviceControllerPtr);
 
   private native String getIpAddress(long deviceControllerPtr, long deviceId);
diff --git a/src/controller/java/src/chip/devicecontroller/GroupKeySecurityPolicy.java b/src/controller/java/src/chip/devicecontroller/GroupKeySecurityPolicy.java
new file mode 100644
index 00000000000000..f17b8c5c1db981
--- /dev/null
+++ b/src/controller/java/src/chip/devicecontroller/GroupKeySecurityPolicy.java
@@ -0,0 +1,44 @@
+/*
+ *   Copyright (c) 2023 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package chip.devicecontroller;
+
+public enum GroupKeySecurityPolicy {
+  TrustFirst(0),
+  CacheAndSync(1);
+
+  private final int id;
+
+  GroupKeySecurityPolicy(int id) {
+    this.id = id;
+  }
+
+  public int getID() {
+    return id;
+  }
+
+  public static GroupKeySecurityPolicy value(int id) throws IllegalArgumentException {
+    for (GroupKeySecurityPolicy policy : GroupKeySecurityPolicy.values()) {
+      if (policy.id == id) {
+        return policy;
+      }
+    }
+    // Throw an exception or return a default value if no match is found.
+    throw new IllegalArgumentException("Invalid id: " + id);
+  }
+}
diff --git a/src/controller/java/src/chip/devicecontroller/model/AttributeWriteRequest.java b/src/controller/java/src/chip/devicecontroller/model/AttributeWriteRequest.java
index 792b7577efc15d..d19ad407b1f4db 100644
--- a/src/controller/java/src/chip/devicecontroller/model/AttributeWriteRequest.java
+++ b/src/controller/java/src/chip/devicecontroller/model/AttributeWriteRequest.java
@@ -29,13 +29,14 @@
 /** An attribute write request that should be used for interaction model write interaction. */
 public final class AttributeWriteRequest {
   private static final Logger logger = Logger.getLogger(AttributeWriteRequest.class.getName());
-  private final ChipPathId endpointId, clusterId, attributeId;
+  @Nullable private final ChipPathId endpointId;
+  private final ChipPathId clusterId, attributeId;
   private final Optional<Integer> dataVersion;
   @Nullable private final byte[] tlv;
   @Nullable private final JSONObject json;
 
   private AttributeWriteRequest(
-      ChipPathId endpointId,
+      @Nullable ChipPathId endpointId,
       ChipPathId clusterId,
       ChipPathId attributeId,
       @Nullable byte[] tlv,
diff --git a/src/controller/java/src/chip/devicecontroller/model/InvokeElement.java b/src/controller/java/src/chip/devicecontroller/model/InvokeElement.java
index 1a97bf64bc012a..b56aae75c2c22f 100644
--- a/src/controller/java/src/chip/devicecontroller/model/InvokeElement.java
+++ b/src/controller/java/src/chip/devicecontroller/model/InvokeElement.java
@@ -19,6 +19,7 @@
 
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
@@ -28,12 +29,15 @@
 /** An invoke element that should be used for interaction model invoke request and response. */
 public final class InvokeElement {
   private static final Logger logger = Logger.getLogger(InvokeElement.class.getName());
-  private final ChipPathId endpointId, clusterId, commandId;
+  @Nullable private final ChipPathId endpointId;
+  private final ChipPathId clusterId, commandId;
+  private final Optional<Integer> groupId;
   @Nullable private final byte[] tlv;
   @Nullable private final JSONObject json;
 
   private InvokeElement(
       ChipPathId endpointId,
+      Optional<Integer> groupId,
       ChipPathId clusterId,
       ChipPathId commandId,
       @Nullable byte[] tlv,
@@ -41,6 +45,7 @@ private InvokeElement(
     this.endpointId = endpointId;
     this.clusterId = clusterId;
     this.commandId = commandId;
+    this.groupId = groupId;
 
     if (tlv != null) {
       this.tlv = tlv.clone();
@@ -72,6 +77,18 @@ public ChipPathId getCommandId() {
     return commandId;
   }
 
+  public Optional<Integer> getGroupId() {
+    return groupId;
+  }
+
+  public boolean isEndpointIdValid() {
+    return endpointId != null;
+  }
+
+  public boolean isGroupIdValid() {
+    return groupId.isPresent();
+  }
+
   @Nullable
   public byte[] getTlvByteArray() {
     if (tlv != null) {
@@ -120,7 +137,7 @@ public static InvokeElement newInstance(
       ChipPathId commandId,
       @Nullable byte[] tlv,
       @Nullable String jsonString) {
-    return new InvokeElement(endpointId, clusterId, commandId, tlv, jsonString);
+    return new InvokeElement(endpointId, Optional.empty(), clusterId, commandId, tlv, jsonString);
   }
 
   /** Create a new {@link InvokeElement} with only concrete ids. */
@@ -132,9 +149,34 @@ public static InvokeElement newInstance(
       @Nullable String jsonString) {
     return new InvokeElement(
         ChipPathId.forId(endpointId),
+        Optional.empty(),
         ChipPathId.forId(clusterId),
         ChipPathId.forId(commandId),
         tlv,
         jsonString);
   }
+
+  public static InvokeElement newGroupInstance(
+      int groupId,
+      long clusterId,
+      long commandId,
+      @Nullable byte[] tlv,
+      @Nullable String jsonString) {
+    return new InvokeElement(
+        null,
+        Optional.of(groupId),
+        ChipPathId.forId(clusterId),
+        ChipPathId.forId(commandId),
+        tlv,
+        jsonString);
+  }
+
+  public static InvokeElement newGroupInstance(
+      int groupId,
+      ChipPathId clusterId,
+      ChipPathId commandId,
+      @Nullable byte[] tlv,
+      @Nullable String jsonString) {
+    return new InvokeElement(null, Optional.of(groupId), clusterId, commandId, tlv, jsonString);
+  }
 }
diff --git a/src/inet/InetInterface.cpp b/src/inet/InetInterface.cpp
index 571c028fafa8d2..e1c14dcfde449f 100644
--- a/src/inet/InetInterface.cpp
+++ b/src/inet/InetInterface.cpp
@@ -502,6 +502,140 @@ void CloseIOCTLSocket()
     }
 }
 
+#if __ANDROID__
+
+static struct if_nameindex * backport_if_nameindex(void);
+static void backport_if_freenameindex(struct if_nameindex *);
+
+static void backport_if_freenameindex(struct if_nameindex * inArray)
+{
+    if (inArray == nullptr)
+    {
+        return;
+    }
+
+    for (size_t i = 0; inArray[i].if_index != 0; i++)
+    {
+        if (inArray[i].if_name != nullptr)
+        {
+            Platform::MemoryFree(inArray[i].if_name);
+        }
+    }
+
+    Platform::MemoryFree(inArray);
+}
+
+static struct if_nameindex * backport_if_nameindex(void)
+{
+    int err;
+    size_t intfIter              = 0;
+    size_t maxIntfNum            = 0;
+    size_t numIntf               = 0;
+    size_t numAddrs              = 0;
+    struct if_nameindex * retval = nullptr;
+    struct if_nameindex * tmpval = nullptr;
+    struct ifaddrs * addrList    = nullptr;
+    struct ifaddrs * addrIter    = nullptr;
+    const char * lastIntfName    = "";
+
+    err = getifaddrs(&addrList);
+    VerifyOrExit(err >= 0, );
+
+    // coalesce on consecutive interface names
+    for (addrIter = addrList; addrIter != nullptr; addrIter = addrIter->ifa_next)
+    {
+        numAddrs++;
+        if (strcmp(addrIter->ifa_name, lastIntfName) != 0)
+        {
+            numIntf++;
+            lastIntfName = addrIter->ifa_name;
+        }
+    }
+
+    tmpval = (struct if_nameindex *) Platform::MemoryAlloc((numIntf + 1) * sizeof(struct if_nameindex));
+    VerifyOrExit(tmpval != nullptr, );
+    memset(tmpval, 0, (numIntf + 1) * sizeof(struct if_nameindex));
+
+    lastIntfName = "";
+    for (addrIter = addrList; addrIter != nullptr; addrIter = addrIter->ifa_next)
+    {
+        if (strcmp(addrIter->ifa_name, lastIntfName) == 0)
+        {
+            continue;
+        }
+
+        unsigned index = if_nametoindex(addrIter->ifa_name);
+        if (index != 0)
+        {
+            tmpval[intfIter].if_index = index;
+            tmpval[intfIter].if_name  = strdup(addrIter->ifa_name);
+            intfIter++;
+        }
+        lastIntfName = addrIter->ifa_name;
+    }
+
+    // coalesce on interface index
+    maxIntfNum = 0;
+    for (size_t i = 0; tmpval[i].if_index != 0; i++)
+    {
+        if (maxIntfNum < tmpval[i].if_index)
+        {
+            maxIntfNum = tmpval[i].if_index;
+        }
+    }
+
+    retval = (struct if_nameindex *) Platform::MemoryAlloc((maxIntfNum + 1) * sizeof(struct if_nameindex));
+    VerifyOrExit(retval != nullptr, );
+    memset(retval, 0, (maxIntfNum + 1) * sizeof(struct if_nameindex));
+
+    for (size_t i = 0; tmpval[i].if_index != 0; i++)
+    {
+        struct if_nameindex * intf = &tmpval[i];
+        if (retval[intf->if_index - 1].if_index == 0)
+        {
+            retval[intf->if_index - 1] = *intf;
+        }
+        else
+        {
+            free(intf->if_name);
+            intf->if_index = 0;
+            intf->if_name  = 0;
+        }
+    }
+
+    intfIter = 0;
+
+    // coalesce potential gaps between indeces
+    for (size_t i = 0; i < maxIntfNum; i++)
+    {
+        if (retval[i].if_index != 0)
+        {
+            retval[intfIter] = retval[i];
+            intfIter++;
+        }
+    }
+
+    for (size_t i = intfIter; i < maxIntfNum; i++)
+    {
+        retval[i].if_index = 0;
+        retval[i].if_name  = nullptr;
+    }
+
+exit:
+    if (tmpval != nullptr)
+    {
+        Platform::MemoryFree(tmpval);
+    }
+
+    if (addrList != nullptr)
+    {
+        freeifaddrs(addrList);
+    }
+
+    return retval;
+}
+#endif // __ANDROID__
+
 InterfaceIterator::InterfaceIterator()
 {
     mIntfArray       = nullptr;
@@ -514,7 +648,11 @@ InterfaceIterator::~InterfaceIterator()
 {
     if (mIntfArray != nullptr)
     {
+#if __ANDROID__
+        backport_if_freenameindex(mIntfArray);
+#else
         if_freenameindex(mIntfArray);
+#endif
         mIntfArray = nullptr;
     }
 }
@@ -528,7 +666,11 @@ bool InterfaceIterator::Next()
 {
     if (mIntfArray == nullptr)
     {
+#if __ANDROID__
+        mIntfArray = backport_if_nameindex();
+#else
         mIntfArray = if_nameindex();
+#endif
     }
     else if (mIntfArray[mCurIntf].if_index != 0)
     {
diff --git a/src/platform/android/InetPlatformConfig.h b/src/platform/android/InetPlatformConfig.h
index 98979504faeb1d..b98cbcc56fd4e9 100644
--- a/src/platform/android/InetPlatformConfig.h
+++ b/src/platform/android/InetPlatformConfig.h
@@ -35,6 +35,10 @@
 #define INET_CONFIG_NUM_TCP_ENDPOINTS 32
 #endif // INET_CONFIG_NUM_TCP_ENDPOINTS
 
+#ifndef IPV6_MULTICAST_IMPLEMENTED
+#define IPV6_MULTICAST_IMPLEMENTED
+#endif
+
 #ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
 #define INET_CONFIG_NUM_UDP_ENDPOINTS 32
 #endif // INET_CONFIG_NUM_UDP_ENDPOINTS