diff --git a/src/android/CHIPTool/app/src/main/AndroidManifest.xml b/src/android/CHIPTool/app/src/main/AndroidManifest.xml
index 9e7ee8657d45e9..ede1f0980aee60 100644
--- a/src/android/CHIPTool/app/src/main/AndroidManifest.xml
+++ b/src/android/CHIPTool/app/src/main/AndroidManifest.xml
@@ -9,6 +9,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.NFC" />
 
     <application
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt
index 9bac357a8900c3..25abcc04db4182 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt
@@ -1,5 +1,12 @@
 package com.google.chip.chiptool.provisioning
 
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.wifi.WifiManager
+import android.net.wifi.ScanResult
+import android.net.wifi.WifiConfiguration
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -19,6 +26,9 @@ import kotlinx.android.synthetic.main.address_commissioning_fragment.discoverBtn
 import kotlinx.android.synthetic.main.address_commissioning_fragment.discoverListSpinner
 import kotlinx.android.synthetic.main.address_commissioning_fragment.discriminatorEditText
 import kotlinx.android.synthetic.main.address_commissioning_fragment.pincodeEditText
+import kotlinx.android.synthetic.main.address_commissioning_fragment.wifiConnectBtn
+import kotlinx.android.synthetic.main.address_commissioning_fragment.wifiScanBtn
+import kotlinx.android.synthetic.main.address_commissioning_fragment.wifiScanListSpinner
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -27,6 +37,8 @@ import kotlinx.coroutines.launch
 
 class AddressCommissioningFragment : Fragment() {
   private val ipAddressList = ArrayList<String>()
+  private val wifiApList = ArrayList<String>()
+  private var wifiApSsid = String()
   private val scope = CoroutineScope(Dispatchers.Main + Job())
 
   override fun onCreateView(
@@ -69,6 +81,84 @@ class AddressCommissioningFragment : Fragment() {
         discoverBtn.isEnabled = true
       }
     }
+
+    wifiConnectBtn.setOnClickListener { _ ->
+      wifiConnectBtn.isEnabled = false
+      val context = getActivity()
+      val wifiManager = context?.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
+      // TODO : filter SSID with Information Element, OPEN authentication
+      var config : WifiConfiguration = WifiConfiguration();
+      config.SSID = "\"${wifiApSsid}\""
+      config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE)
+
+      Log.d(TAG, "Disconnect existing connection")
+      wifiManager.disconnect()
+      Log.d(TAG, "Add network ${config.SSID}")
+      var res = wifiManager.addNetwork(config)
+      if (res == -1) {
+        Log.d(TAG,"Add network failed")
+      } else {
+        var success = wifiManager.enableNetwork(res, true)
+        if (success) {
+          Log.d(TAG, "Enable network ${config.SSID} succeeded")
+        } else {
+          Log.d(TAG, "Enable network ${config.SSID} failed")
+          wifiConnectBtn.isEnabled = true
+        }
+      }
+    }
+
+    wifiScanBtn.setOnClickListener { _ ->
+      wifiScanBtn.isEnabled = false
+      val context = getActivity()
+      val wifiManager = context?.getSystemService(Context.WIFI_SERVICE) as WifiManager
+      val wifiScanReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+          Log.d(TAG, "Scan result event received")
+          val success = intent.getBooleanExtra(WifiManager.EXTRA_RESULTS_UPDATED, false)
+          if (success) {
+            Log.d(TAG, "Scan succeeded")
+            val results = wifiManager.scanResults
+            updateWifiScanListSpinner(results)
+          } else {
+            Log.d(TAG, "Scan failed")
+          }
+          wifiScanBtn.isEnabled = true
+        }
+      }
+
+      val intentFilter = IntentFilter()
+      intentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)
+
+      context.registerReceiver(wifiScanReceiver, intentFilter)
+      val success = wifiManager.startScan()
+      if (!success) {
+        Log.d(TAG, "Scan not started")
+       // TODO: scan failure handling
+      } else {
+        Log.d(TAG, "Scan started")
+      }
+    }
+  }
+
+  private fun updateWifiScanListSpinner(scanResults : MutableList<ScanResult>) {
+    wifiApList.clear()
+    for (result in scanResults) {
+      if (result.SSID.toString().isNotEmpty())
+        wifiApList.add("${result.SSID}, ${result.BSSID}, ${result.level}")
+    }
+    requireActivity().runOnUiThread {
+      wifiScanListSpinner.adapter =
+        ArrayAdapter(requireContext(), android.R.layout.simple_spinner_dropdown_item, wifiApList)
+      wifiScanListSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+          wifiApSsid = wifiApList[position].split(",")[0].trim()
+          Log.d(TAG, "ready to connect to $wifiApSsid")
+        }
+        override fun onNothingSelected(parent: AdapterView<*>) {}
+      }
+    }
   }
 
   private fun updateSpinner() {
@@ -98,4 +188,4 @@ class AddressCommissioningFragment : Fragment() {
 
     fun newInstance(): AddressCommissioningFragment = AddressCommissioningFragment()
   }
-}
\ No newline at end of file
+}
diff --git a/src/android/CHIPTool/app/src/main/res/layout/address_commissioning_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/address_commissioning_fragment.xml
index 4ff57d1767d7ed..b82df0400a7a45 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/address_commissioning_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/address_commissioning_fragment.xml
@@ -84,6 +84,24 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/address_commissioning_fragment_flow">
 
+    <Button
+        android:id="@+id/wifiScanBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/wifi_scan_btn_text"/>
+
+    <Spinner
+        android:id="@+id/wifiScanListSpinner"
+        android:padding="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/wifiConnectBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/wifi_connect_btn_text"/>
+
     <Button
         android:id="@+id/discoverBtn"
         android:layout_width="wrap_content"
@@ -108,4 +126,4 @@
       app:layout_constraintHorizontal_bias="1.0"
       app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/android/CHIPTool/app/src/main/res/values/strings.xml b/src/android/CHIPTool/app/src/main/res/values/strings.xml
index ada15249f6dca6..6c187c56d4f1dc 100644
--- a/src/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/src/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -39,6 +39,7 @@
     <string name="enter_pincode_label_text">Pincode</string>
     <string name="commission_btn_text">Commission</string>
     <string name="dns_discover_btn_text">Discover</string>
+    <string name="wifi_scan_btn_text">Wi-Fi Scan</string>
 
     <string name="send_command_on_btn_text">On</string>
     <string name="send_command_off_btn_text">Off</string>
@@ -163,4 +164,5 @@
     <string name="select_a_command">Select a command</string>
     <string name="select_a_cluster">Select a cluster</string>
     <string name="endpoint_name">Endpoint: </string>
+    <string name="wifi_connect_btn_text">Connect</string>
 </resources>