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

* commit '231b2056dd09a411ba91c0517b3ec8e365ee33d7':

Change-Id: I9d9baa614eb7e631524447e03c5448d16c7a3b4e