Merge "Fix UnwindTest repeatability." am: cfadedb139
am: 5c9efd1800

Change-Id: I9574c2e69060c3e8aacc459e4c1436288ab44dcf