zip file naming
zip file naming


Former-commit-id: 44ef2b5968dd677d3c50ae857b2cd1079984750b [formerly 807cc584eb54cdde0990e0982af8b2f7d9fde996]
Former-commit-id: ed563cada4f23612719246edc6d645e91ecf8b93
firepick/FireHawk,daytonpid/FireHawk