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

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