Merge "Support copy-on-write persistent data block when running a DSU"