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

Change-Id: Ia12107ec50cf5dfd41cf9500a97aaaf5845dc4e6