Merge "Avoid quick shutdown after a  driver start" into ics-mr1