Merge "Only call one unwinder."
am: d9f183b83b

Change-Id: I01ec531fa8846880de91ae4a63db9cb0f1b65ffe