Merge "Correctly skip files that are excluded from restore" into mnc-dev