am 8485fb07: am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"

* commit '8485fb074bb1b751224b167273de0f443b94680f':
  Use a less freqent dummy file name: zipdummy