Merge "Make sure we can properly shutdown even if" into ics-mr1