diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index bb69e61..9cf4fbf 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -219,7 +219,7 @@
         params.SetCountryCode(copiedCode);
     }
 
-    wrapper->UpdateCommissioningParameters(params);
+    TEMPORARY_RETURN_IGNORED wrapper->UpdateCommissioningParameters(params);
 
     CHIP_ERROR err = wrapper->mGroupDataProvider.Init();
     if (err != CHIP_NO_ERROR)
@@ -279,7 +279,7 @@
     if (rootCertificate != nullptr && nodeOperationalCertificate != nullptr && keypairDelegate != nullptr)
     {
         CHIPP256KeypairBridge * nativeKeypairBridge = wrapper->GetP256KeypairBridge();
-        nativeKeypairBridge->SetDelegate(keypairDelegate);
+        TEMPORARY_RETURN_IGNORED nativeKeypairBridge->SetDelegate(keypairDelegate);
         *errInfoOnFailure = nativeKeypairBridge->Initialize(Crypto::ECPKeyTarget::ECDSA);
         if (*errInfoOnFailure != CHIP_NO_ERROR)
         {
@@ -380,7 +380,7 @@
     *errInfoOnFailure = chip::Credentials::SetSingleIpkEpochKey(
         &wrapper->mGroupDataProvider, wrapper->Controller()->GetFabricIndex(), ipkSpan, compressedFabricIdSpan);
 
-    getICDClientStorage()->UpdateFabricList(wrapper->Controller()->GetFabricIndex());
+    TEMPORARY_RETURN_IGNORED getICDClientStorage()->UpdateFabricList(wrapper->Controller()->GetFabricIndex());
 
     auto engine       = chip::app::InteractionModelEngine::GetInstance();
     *errInfoOnFailure = wrapper->mCheckInDelegate.Init(getICDClientStorage(), engine);
@@ -583,7 +583,7 @@
     }
     else
     {
-        chip::Crypto::DRBG_get_bytes(mICDSymmetricKey, sizeof(mICDSymmetricKey));
+        TEMPORARY_RETURN_IGNORED chip::Crypto::DRBG_get_bytes(mICDSymmetricKey, sizeof(mICDSymmetricKey));
     }
     params.SetICDSymmetricKey(chip::ByteSpan(mICDSymmetricKey));
 
@@ -849,7 +849,8 @@
     // For ICD
     mUserActiveModeTriggerHint = info.icd.userActiveModeTriggerHint;
     memset(mUserActiveModeTriggerInstructionBuffer, 0x00, kUserActiveModeTriggerInstructionBufferLen);
-    CopyCharSpanToMutableCharSpan(info.icd.userActiveModeTriggerInstruction, mUserActiveModeTriggerInstruction);
+    TEMPORARY_RETURN_IGNORED CopyCharSpanToMutableCharSpan(info.icd.userActiveModeTriggerInstruction,
+                                                           mUserActiveModeTriggerInstruction);
 
     ChipLogProgress(AppServer, "OnReadCommissioningInfo ICD - IdleModeDuration=%u activeModeDuration=%u activeModeThreshold=%u",
                     info.icd.idleModeDuration, info.icd.activeModeDuration, info.icd.activeModeThreshold);
@@ -881,30 +882,30 @@
     std::string NetworkingStatusClassName     = "java/lang/Integer";
     std::string NetworkingStatusCtorSignature = "(I)V";
     jint jniNetworkingStatus                  = static_cast<jint>(dataResponse.networkingStatus);
-    chip::JniReferences::GetInstance().CreateBoxedObject<jint>(NetworkingStatusClassName, NetworkingStatusCtorSignature,
-                                                               jniNetworkingStatus, NetworkingStatus);
+    TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+        NetworkingStatusClassName, NetworkingStatusCtorSignature, jniNetworkingStatus, NetworkingStatus);
     jobject DebugText;
     if (!dataResponse.debugText.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, DebugText);
+        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, DebugText);
     }
     else
     {
         jobject DebugTextInsideOptional;
         DebugTextInsideOptional =
             env->NewStringUTF(std::string(dataResponse.debugText.Value().data(), dataResponse.debugText.Value().size()).c_str());
-        chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
+        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(DebugTextInsideOptional, DebugText);
     }
     jobject WiFiScanResults;
     if (!dataResponse.wiFiScanResults.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, WiFiScanResults);
+        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, WiFiScanResults);
     }
     else
     {
         // TODO: use this
         jobject WiFiScanResultsInsideOptional;
-        chip::JniReferences::GetInstance().CreateArrayList(WiFiScanResultsInsideOptional);
+        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateArrayList(WiFiScanResultsInsideOptional);
 
         auto iter_WiFiScanResultsInsideOptional = dataResponse.wiFiScanResults.Value().begin();
         while (iter_WiFiScanResultsInsideOptional.Next())
@@ -914,7 +915,7 @@
             std::string newElement_securityClassName     = "java/lang/Integer";
             std::string newElement_securityCtorSignature = "(I)V";
             jint jniNewElementSecurity                   = static_cast<jint>(entry.security.Raw());
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>(
                 newElement_securityClassName, newElement_securityCtorSignature, jniNewElementSecurity, newElement_security);
             jobject newElement_ssid;
             jbyteArray newElement_ssidByteArray = env->NewByteArray(static_cast<jsize>(entry.ssid.size()));
@@ -928,14 +929,16 @@
             newElement_bssid = newElement_bssidByteArray;
             jobject newElement_channel;
             jint jniChannel = static_cast<jint>(entry.channel);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniChannel, newElement_channel);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                                                jniChannel, newElement_channel);
             jobject newElement_wiFiBand;
             jint jniWiFiBand = static_cast<jint>(entry.wiFiBand);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniWiFiBand,
-                                                                       newElement_wiFiBand);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                                                jniWiFiBand, newElement_wiFiBand);
             jobject newElement_rssi;
             jint jniRssi = static_cast<jint>(entry.rssi);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniRssi, newElement_rssi);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                                                jniRssi, newElement_rssi);
 
             jclass wiFiInterfaceScanResultStructClass;
             err = chip::JniReferences::GetInstance().GetLocalClassRef(env, "chip/devicecontroller/WiFiScanResult",
@@ -957,19 +960,19 @@
             jobject newElement =
                 env->NewObject(wiFiInterfaceScanResultStructClass, wiFiInterfaceScanResultStructCtor, newElement_security,
                                newElement_ssid, newElement_bssid, newElement_channel, newElement_wiFiBand, newElement_rssi);
-            chip::JniReferences::GetInstance().AddToList(WiFiScanResultsInsideOptional, newElement);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().AddToList(WiFiScanResultsInsideOptional, newElement);
         }
-        chip::JniReferences::GetInstance().CreateOptional(WiFiScanResultsInsideOptional, WiFiScanResults);
+        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(WiFiScanResultsInsideOptional, WiFiScanResults);
     }
     jobject ThreadScanResults;
     if (!dataResponse.threadScanResults.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, ThreadScanResults);
+        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(nullptr, ThreadScanResults);
     }
     else
     {
         jobject ThreadScanResultsInsideOptional;
-        chip::JniReferences::GetInstance().CreateArrayList(ThreadScanResultsInsideOptional);
+        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateArrayList(ThreadScanResultsInsideOptional);
 
         auto iter_ThreadScanResultsInsideOptional = dataResponse.threadScanResults.Value().begin();
         while (iter_ThreadScanResultsInsideOptional.Next())
@@ -977,19 +980,22 @@
             auto & entry = iter_ThreadScanResultsInsideOptional.GetValue();
             jobject newElement_panId;
             jint jniPanId = static_cast<jint>(entry.panId);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniPanId, newElement_panId);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                                                jniPanId, newElement_panId);
             jobject newElement_extendedPanId;
             jlong jniExtendedPanId = static_cast<jlong>(entry.extendedPanId);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jlong>("java/lang/Long", "(J)V", jniExtendedPanId,
-                                                                        newElement_extendedPanId);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
+                "java/lang/Long", "(J)V", jniExtendedPanId, newElement_extendedPanId);
             jobject newElement_networkName;
             newElement_networkName = env->NewStringUTF(std::string(entry.networkName.data(), entry.networkName.size()).c_str());
             jobject newElement_channel;
             jint jniChannel = static_cast<jint>(entry.channel);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniChannel, newElement_channel);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                                                jniChannel, newElement_channel);
             jobject newElement_version;
             jint jniVersion = static_cast<jint>(entry.version);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniVersion, newElement_version);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                                                jniVersion, newElement_version);
             jobject newElement_extendedAddress;
             jbyteArray newElement_extendedAddressByteArray = env->NewByteArray(static_cast<jsize>(entry.extendedAddress.size()));
             env->SetByteArrayRegion(newElement_extendedAddressByteArray, 0, static_cast<jsize>(entry.extendedAddress.size()),
@@ -997,10 +1003,12 @@
             newElement_extendedAddress = newElement_extendedAddressByteArray;
             jobject newElement_rssi;
             jint jniRssi = static_cast<jint>(entry.rssi);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniRssi, newElement_rssi);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V",
+                                                                                                jniRssi, newElement_rssi);
             jobject newElement_lqi;
             jint jniLqi = static_cast<jint>(entry.lqi);
-            chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniLqi, newElement_lqi);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", jniLqi,
+                                                                                                newElement_lqi);
 
             jclass threadInterfaceScanResultStructClass;
             err = chip::JniReferences::GetInstance().GetLocalClassRef(env, "chip/devicecontroller/ThreadScanResult",
@@ -1024,9 +1032,10 @@
                 env->NewObject(threadInterfaceScanResultStructClass, threadInterfaceScanResultStructCtor, newElement_panId,
                                newElement_extendedPanId, newElement_networkName, newElement_channel, newElement_version,
                                newElement_extendedAddress, newElement_rssi, newElement_lqi);
-            chip::JniReferences::GetInstance().AddToList(ThreadScanResultsInsideOptional, newElement);
+            TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().AddToList(ThreadScanResultsInsideOptional, newElement);
         }
-        chip::JniReferences::GetInstance().CreateOptional(ThreadScanResultsInsideOptional, ThreadScanResults);
+        TEMPORARY_RETURN_IGNORED chip::JniReferences::GetInstance().CreateOptional(ThreadScanResultsInsideOptional,
+                                                                                   ThreadScanResults);
     }
 
     env->CallVoidMethod(mJavaObjectRef.ObjectRef(), javaMethod, NetworkingStatus, DebugText, WiFiScanResults, ThreadScanResults);