Merge "ART: Save or erase the file even if I/O failed"