Merge "SensorList: Don't output UUIDs" into nyc-dev