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

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