Merge "Add conversion code for sensor_t to v2.1 SensorInfo"