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

Change-Id: Ia05ce723c89ef5eaebb881a4a0c62f6cd9d536c4