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

Change-Id: Ia6f778dc7894340ae494f8144f49ce91f3bbc732