Merge "Delete DefaultFileStoreTest."