Update measurements API to support sensor_id.
Firther updates to measurements API