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

Change-Id: I9714dcbb228fd33921e1ceebb23c0049c2b49de2