Merge "Fix UnwindTest repeatability."