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

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