Index: firmware/App/Services/NVMessagingDD.c
===================================================================
diff -u -r83bae6ae5f7f26a3511d1d6965310fd8ac9ad496 -rc49f9ed931d60e5bd1d0a406fde6c9fe1437f73b
--- firmware/App/Services/NVMessagingDD.c	(.../NVMessagingDD.c)	(revision 83bae6ae5f7f26a3511d1d6965310fd8ac9ad496)
+++ firmware/App/Services/NVMessagingDD.c	(.../NVMessagingDD.c)	(revision c49f9ed931d60e5bd1d0a406fde6c9fe1437f73b)
@@ -2340,6 +2340,9 @@
             if( idx < NUM_OF_CONDUCTIVITY_SENSORS )
             {
                 memcpy( &record, payloadPtr, recordSize );
+
+                // TODO: Update calibrationTime to current timestamp published by UI.
+                record.calibrationTime = 0;
                 record.crc = crc16( (U08*)&record, recordSize );
                 setNVMMRecord( NV_DD_DATA_CAL_CONDUCTIVITY_SENSORS, (U08*)&record, idx );
                 result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD );