am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1

* commit '70a1ee38b24a7c8dfc789db024bdf54f277ddba3':
  Fix SCO start stop tests.