diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn
index 130b2fb88c195a..ab81054bb0f1f0 100644
--- a/src/controller/data_model/BUILD.gn
+++ b/src/controller/data_model/BUILD.gn
@@ -74,20 +74,44 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/BooleanStateClient-ReadImpl.cpp",
       "jni/BridgedDeviceBasicInformationClient-InvokeSubscribeImpl.cpp",
       "jni/BridgedDeviceBasicInformationClient-ReadImpl.cpp",
+      "jni/BromateConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/BromateConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/BromodichloromethaneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/BromodichloromethaneConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/BromoformConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/BromoformConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/CHIPCallbackTypes.h",
+      "jni/CHIPReadCallbacks.h",
+      "jni/CarbonDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/CarbonDioxideConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/CarbonMonoxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/CarbonMonoxideConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/CeramicFilterMonitoringClient-InvokeSubscribeImpl.cpp",
       "jni/CeramicFilterMonitoringClient-ReadImpl.cpp",
       "jni/ChannelClient-InvokeSubscribeImpl.cpp",
       "jni/ChannelClient-ReadImpl.cpp",
-      "jni/CHIPCallbackTypes.h",
-      "jni/CHIPReadCallbacks.h",
+      "jni/ChloraminesConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ChloraminesConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/ChlorineConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ChlorineConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/ChlorodibromomethaneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ChlorodibromomethaneConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/ChloroformConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ChloroformConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/ColorControlClient-InvokeSubscribeImpl.cpp",
       "jni/ColorControlClient-ReadImpl.cpp",
       "jni/ContentLauncherClient-InvokeSubscribeImpl.cpp",
       "jni/ContentLauncherClient-ReadImpl.cpp",
+      "jni/CopperConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/CopperConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/DescriptorClient-InvokeSubscribeImpl.cpp",
       "jni/DescriptorClient-ReadImpl.cpp",
       "jni/DiagnosticLogsClient-InvokeSubscribeImpl.cpp",
       "jni/DiagnosticLogsClient-ReadImpl.cpp",
+      "jni/DishwasherModeSelectClient-InvokeSubscribeImpl.cpp",
+      "jni/DishwasherModeSelectClient-ReadImpl.cpp",
+      "jni/DissolvedOxygenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/DissolvedOxygenConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/DoorLockClient-InvokeSubscribeImpl.cpp",
       "jni/DoorLockClient-ReadImpl.cpp",
       "jni/ElectricalMeasurementClient-InvokeSubscribeImpl.cpp",
@@ -96,14 +120,24 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/ElectrostaticFilterMonitoringClient-ReadImpl.cpp",
       "jni/EthernetNetworkDiagnosticsClient-InvokeSubscribeImpl.cpp",
       "jni/EthernetNetworkDiagnosticsClient-ReadImpl.cpp",
+      "jni/EthyleneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/EthyleneConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/EthyleneOxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/EthyleneOxideConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/FanControlClient-InvokeSubscribeImpl.cpp",
       "jni/FanControlClient-ReadImpl.cpp",
       "jni/FaultInjectionClient-InvokeSubscribeImpl.cpp",
       "jni/FaultInjectionClient-ReadImpl.cpp",
+      "jni/FecalColiformEColiConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/FecalColiformEColiConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/FixedLabelClient-InvokeSubscribeImpl.cpp",
       "jni/FixedLabelClient-ReadImpl.cpp",
       "jni/FlowMeasurementClient-InvokeSubscribeImpl.cpp",
       "jni/FlowMeasurementClient-ReadImpl.cpp",
+      "jni/FluorideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/FluorideConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/FormaldehydeConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/FormaldehydeConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/FuelTankMonitoringClient-InvokeSubscribeImpl.cpp",
       "jni/FuelTankMonitoringClient-ReadImpl.cpp",
       "jni/GeneralCommissioningClient-InvokeSubscribeImpl.cpp",
@@ -114,8 +148,14 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/GroupKeyManagementClient-ReadImpl.cpp",
       "jni/GroupsClient-InvokeSubscribeImpl.cpp",
       "jni/GroupsClient-ReadImpl.cpp",
+      "jni/HaloaceticAcidsConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/HaloaceticAcidsConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/HepaFilterMonitoringClient-InvokeSubscribeImpl.cpp",
       "jni/HepaFilterMonitoringClient-ReadImpl.cpp",
+      "jni/HydrogenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/HydrogenConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/HydrogenSulfideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/HydrogenSulfideConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/IcdManagementClient-InvokeSubscribeImpl.cpp",
       "jni/IcdManagementClient-ReadImpl.cpp",
       "jni/IdentifyClient-InvokeSubscribeImpl.cpp",
@@ -128,12 +168,18 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/IonizingFilterMonitoringClient-ReadImpl.cpp",
       "jni/KeypadInputClient-InvokeSubscribeImpl.cpp",
       "jni/KeypadInputClient-ReadImpl.cpp",
+      "jni/LaundryWasherModeSelectClient-InvokeSubscribeImpl.cpp",
+      "jni/LaundryWasherModeSelectClient-ReadImpl.cpp",
+      "jni/LeadConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/LeadConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/LevelControlClient-InvokeSubscribeImpl.cpp",
       "jni/LevelControlClient-ReadImpl.cpp",
       "jni/LocalizationConfigurationClient-InvokeSubscribeImpl.cpp",
       "jni/LocalizationConfigurationClient-ReadImpl.cpp",
-      "jni/LowPowerClient-ReadImpl.cpp",
       "jni/LowPowerClient-InvokeSubscribeImpl.cpp",
+      "jni/LowPowerClient-ReadImpl.cpp",
+      "jni/ManganeseConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ManganeseConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/MediaInputClient-InvokeSubscribeImpl.cpp",
       "jni/MediaInputClient-ReadImpl.cpp",
       "jni/MediaPlaybackClient-InvokeSubscribeImpl.cpp",
@@ -142,6 +188,10 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/ModeSelectClient-ReadImpl.cpp",
       "jni/NetworkCommissioningClient-InvokeSubscribeImpl.cpp",
       "jni/NetworkCommissioningClient-ReadImpl.cpp",
+      "jni/NitricOxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/NitricOxideConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/NitrogenDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/NitrogenDioxideConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/OccupancySensingClient-InvokeSubscribeImpl.cpp",
       "jni/OccupancySensingClient-ReadImpl.cpp",
       "jni/OnOffClient-InvokeSubscribeImpl.cpp",
@@ -150,14 +200,24 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/OnOffSwitchConfigurationClient-ReadImpl.cpp",
       "jni/OperationalCredentialsClient-InvokeSubscribeImpl.cpp",
       "jni/OperationalCredentialsClient-ReadImpl.cpp",
+      "jni/OperationalStateClient-InvokeSubscribeImpl.cpp",
+      "jni/OperationalStateClient-ReadImpl.cpp",
       "jni/OtaSoftwareUpdateProviderClient-InvokeSubscribeImpl.cpp",
       "jni/OtaSoftwareUpdateProviderClient-ReadImpl.cpp",
       "jni/OtaSoftwareUpdateRequestorClient-InvokeSubscribeImpl.cpp",
       "jni/OtaSoftwareUpdateRequestorClient-ReadImpl.cpp",
+      "jni/OxygenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/OxygenConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/OzoneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/OzoneConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/OzoneFilterMonitoringClient-InvokeSubscribeImpl.cpp",
       "jni/OzoneFilterMonitoringClient-ReadImpl.cpp",
-      "jni/OperationalStateClient-InvokeSubscribeImpl.cpp",
-      "jni/OperationalStateClient-ReadImpl.cpp",
+      "jni/Pm10ConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/Pm10ConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/Pm1ConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/Pm1ConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/Pm25ConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/Pm25ConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/PowerSourceClient-InvokeSubscribeImpl.cpp",
       "jni/PowerSourceClient-ReadImpl.cpp",
       "jni/PowerSourceConfigurationClient-InvokeSubscribeImpl.cpp",
@@ -174,16 +234,30 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/PulseWidthModulationClient-ReadImpl.cpp",
       "jni/PumpConfigurationAndControlClient-InvokeSubscribeImpl.cpp",
       "jni/PumpConfigurationAndControlClient-ReadImpl.cpp",
+      "jni/RadonConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/RadonConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/RefrigeratorAlarmClient-InvokeSubscribeImpl.cpp",
       "jni/RefrigeratorAlarmClient-ReadImpl.cpp",
+      "jni/RefrigeratorAndTemperatureControlledCabinetModeSelectClient-InvokeSubscribeImpl.cpp",
+      "jni/RefrigeratorAndTemperatureControlledCabinetModeSelectClient-ReadImpl.cpp",
       "jni/RelativeHumidityMeasurementClient-InvokeSubscribeImpl.cpp",
       "jni/RelativeHumidityMeasurementClient-ReadImpl.cpp",
+      "jni/RvcCleanModeSelectClient-InvokeSubscribeImpl.cpp",
+      "jni/RvcCleanModeSelectClient-ReadImpl.cpp",
+      "jni/RvcRunModeSelectClient-InvokeSubscribeImpl.cpp",
+      "jni/RvcRunModeSelectClient-ReadImpl.cpp",
       "jni/ScenesClient-InvokeSubscribeImpl.cpp",
       "jni/ScenesClient-ReadImpl.cpp",
-      "jni/SmokeCoAlarmClient-ReadImpl.cpp",
       "jni/SmokeCoAlarmClient-InvokeSubscribeImpl.cpp",
+      "jni/SmokeCoAlarmClient-ReadImpl.cpp",
+      "jni/SodiumConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/SodiumConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/SoftwareDiagnosticsClient-InvokeSubscribeImpl.cpp",
       "jni/SoftwareDiagnosticsClient-ReadImpl.cpp",
+      "jni/SulfateConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/SulfateConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/SulfurDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/SulfurDioxideConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/SwitchClient-InvokeSubscribeImpl.cpp",
       "jni/SwitchClient-ReadImpl.cpp",
       "jni/TargetNavigatorClient-InvokeSubscribeImpl.cpp",
@@ -204,6 +278,14 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/TimeSynchronizationClient-ReadImpl.cpp",
       "jni/TonerCartridgeMonitoringClient-InvokeSubscribeImpl.cpp",
       "jni/TonerCartridgeMonitoringClient-ReadImpl.cpp",
+      "jni/TotalColiformBacteriaConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/TotalColiformBacteriaConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/TotalTrihalomethanesConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/TotalTrihalomethanesConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/TotalVolatileOrganicCompoundsConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/TotalVolatileOrganicCompoundsConcentrationMeasurementClient-ReadImpl.cpp",
+      "jni/TurbidityConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/TurbidityConcentrationMeasurementClient-ReadImpl.cpp",
       "jni/UnitLocalizationClient-InvokeSubscribeImpl.cpp",
       "jni/UnitLocalizationClient-ReadImpl.cpp",
       "jni/UnitTestingClient-InvokeSubscribeImpl.cpp",
@@ -220,80 +302,8 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "jni/WiFiNetworkDiagnosticsClient-ReadImpl.cpp",
       "jni/WindowCoveringClient-InvokeSubscribeImpl.cpp",
       "jni/WindowCoveringClient-ReadImpl.cpp",
-      "jni/ZeoliteFilterMonitoringClient-ReadImpl.cpp",
       "jni/ZeoliteFilterMonitoringClient-InvokeSubscribeImpl.cpp",
-      "jni/BromateConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/BromateConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/BromodichloromethaneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/BromodichloromethaneConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/BromoformConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/BromoformConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/CarbonDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/CarbonDioxideConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/CarbonMonoxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/CarbonMonoxideConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/ChloraminesConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/ChloraminesConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/ChlorineConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/ChlorineConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/ChlorodibromomethaneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/ChlorodibromomethaneConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/ChloroformConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/ChloroformConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/CopperConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/CopperConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/DissolvedOxygenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/DissolvedOxygenConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/EthyleneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/EthyleneConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/EthyleneOxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/EthyleneOxideConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/FecalColiformEColiConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/FecalColiformEColiConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/FluorideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/FluorideConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/FormaldehydeConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/FormaldehydeConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/HaloaceticAcidsConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/HaloaceticAcidsConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/HydrogenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/HydrogenConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/HydrogenSulfideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/HydrogenSulfideConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/LeadConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/LeadConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/ManganeseConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/ManganeseConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/NitricOxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/NitricOxideConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/NitrogenDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/NitrogenDioxideConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/OxygenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/OxygenConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/OzoneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/OzoneConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/RadonConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/RadonConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/SodiumConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/SodiumConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/SulfateConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/SulfateConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/SulfurDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/SulfurDioxideConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/TotalColiformBacteriaConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/TotalColiformBacteriaConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/TotalTrihalomethanesConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/TotalTrihalomethanesConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/TotalVolatileOrganicCompoundsConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/TotalVolatileOrganicCompoundsConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/TurbidityConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/TurbidityConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/Pm1ConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/Pm1ConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/Pm10ConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/Pm10ConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
-      "jni/Pm25ConcentrationMeasurementClient-ReadImpl.cpp",
-      "jni/Pm25ConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
+      "jni/ZeoliteFilterMonitoringClient-ReadImpl.cpp",
 
       # Disable CM cluster table tests until update is done
       # https://github.com/project-chip/connectedhomeip/issues/24425