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

Change-Id: I7ca1ef413f478aeebbc0b530efc1ded20a329bad