am b64f25ad: am 253f2c33: am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev

* commit 'b64f25ad97a92be4dcf8844c79c218ae9c1e0af4':
  Correctly skip files that are excluded from restore