Merge "zip_archive: Fix tests broken by 1f93d71022cca7bb6bb9eec49."
am: 492de535c4

Change-Id: I0e6de0b6f71626fefbb04befd2e8e84f439ae1fe