am 0e034e5a: Merge change 5162 into donut

Merge commit '0e034e5a9a71e5e196baff630dca796a0e3ed3e2'

* commit '0e034e5a9a71e5e196baff630dca796a0e3ed3e2':
  Preserve file access mode when backing up / restoring files