Merge "Fix SCO start stop tests." into ics-mr1