Merge "Change sensor timestamp format from date to seconds"