Merge "Fix UnwindTest repeatability."
am: cfadedb139

Change-Id: I4ca22b4c132353cad19af362c1f59d743220433e