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

* commit '03046888822d07ec020eb7a2f685be4f7bcded31':
  Only try to add details to zip once.

Change-Id: I629618cc5cf105584ebf911b3de1b6649f1c59c6