Update to latest upstream changes for default_storage.