Change-Id: I1f699f9e0294209478680ae3e2e12ae9085c91fc
... which allows us to drop gb_ZipPackage. Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a