Merge "Add test for DE (user) snapshot and restore."