Merge "Test for userdata restore in staged rollback test."