Addressed comments

src/app/clusters/ota-requestor/ExtendedOTARequestorDriver.cpp

@@ -77,6 +77,7 @@ CHIP_ERROR ExtendedOTARequestorDriver::GetUserConsentSubject(chip::ota::UserCons
     else
     {
         ChipLogError(SoftwareUpdate, "ExtendedOTARequestorDriver::GetUserConsentSubject: mLastProvider is empty");
+        return CHIP_ERROR_INTERNAL;
     }
 
     // TODO: As we cannot use the src/app/Server.h in here so, figure out a way to get the node id.

src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp

@@ -342,25 +342,16 @@ bool GenericOTARequestorDriver::DetermineProviderLocation(ProviderLocation::Type
         }
     }
 
-    // If no suitable candidate found, return in the following order:
-    // - first element of the default providers list OR
-    // - the last used provider OR
-    // - error (no suitable candidate)
+    // If no suitable candidate found, return the first element of the default providers list or an error
     iterator = mRequestor->GetDefaultOTAProviderListIterator();
     if (iterator.Next())
     {
         providerLocation = iterator.GetValue();
         return true;
     }
-    else if (mLastUsedProvider.HasValue())
-    {
-        providerLocation = mLastUsedProvider.Value();
-        return true;
-    }
     else
     {
-        ChipLogError(SoftwareUpdate,
-                     "GenericOTARequestorDriver::DetermineProviderLocation: No suitable OTA Provider candidate found");
+        ChipLogError(SoftwareUpdate, "No suitable OTA Provider candidate found");
         return false;
     }
     return false;

src/app/clusters/ota-requestor/GenericOTARequestorDriver.h

@@ -87,7 +87,7 @@ class GenericOTARequestorDriver : public OTARequestorDriver
     uint32_t mPeriodicQueryTimeInterval = (24 * 60 * 60); // Timeout for querying providers on the default OTA provider list
 
     using ProviderLocationType = app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type;
-    chip::Optional<ProviderLocationType> mLastUsedProvider; // Provider location used for the last query or update
+    Optional<ProviderLocationType> mLastUsedProvider; // Provider location used for the last query or update
 };
 
 } // namespace DeviceLayer