am 70a76816: Merge change 7944 into donut

Merge commit '70a76816e5268e345a2a52d12c7c0140e9645015'

* commit '70a76816e5268e345a2a52d12c7c0140e9645015':
  better patching for zip files