Merge "toro: Enable toro device" into ics