Merge "Only try to add details to zip once." into nyc-dev am: 0304688
am: 39dd493

* commit '39dd4939ab26469ab2bc63c4a497960df24ec741':

Change-Id: I8da4c5193b451eb93302861856039fac18c51bcf