Merge "CreateSnapshot: reduce zero-filling for CoW images"