Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev