Revert "Revert "Skip restore of read-only directories""

This reverts commit 461ffb80e6ccdd3ae7282264edae1f37f0f8ef3c.

Reason for revert: Breaking master, revert needs to be more targeted.

Change-Id: I8fe96ab08d3f82abd9edd3360e9e57d78a0bf6ce
2 files changed