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