Merge "Add support for archives to ExternalStorageProvider."