Merge "Skip zip regeneration when user didn't provide extra info."