Merge "Remove internal AtomicFile"