Merge "Only call one unwinder." am: d9f183b83b
am: b66f601c6d

Change-Id: I4de00001cfa7552436db01ea442aa8a3ae8068c5