Merge "service_contexts: don't delete intermediate on failure"