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

Change-Id: Ia845756bf799a0a02f4aadb3a004ecc1d8cfc99f