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

Change-Id: I19831c895200c09436b8f15aa4cce1e269cb047f