Redid zipping process

Change-Id: Ic410c95e3972c2e955ad7edd26035494c3a6b758