am 7fc865a4: service_contexts: don\'t delete intermediate on failure

* commit '7fc865a4caec1a2ced41918449e34596f50f8c43':
  service_contexts: don't delete intermediate on failure