Merge "If the pc is set to zero, the unwind is done."
am: 09123383cb

Change-Id: I0583cd83dfba1429e74a1be5e8e4a8fefb815171