Merge "Remove sensorId, userId from onChallenge*"