am 45a04db3: Merge "Avoid quick shutdown after a  driver start" into ics-mr1

* commit '45a04db3f95755829b24043d30d7da7182b4f33b':
  Avoid quick shutdown after a  driver start