Merge "RMS: Delete user data snapshots when deleting a rollback"