Merge "Remove sensorId and userId from all Session methods"