Merge "Skip restore of read-only directories" into tm-dev