Merge "Clean up after failed MemoryFileTest.testPurge()"