Merge "unwindstack: fix dangling pointer in LocalUpdatableMaps."
am: 6e0a0dad52

Change-Id: Ia4a79c5b1120175b3176edb750722c5743bc1f05