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

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