Merge "Minor API changes to VirtualSensor."