Merge "Add fields to SensorProperties"