Merge "zip_archive: Fix tests broken by 1f93d71022cca7bb6bb9eec49."