Merge "Method to avoid skipping frames for local unwinds."
am: 43cb7ea4ed

Change-Id: I1c2c9e88d30e56d00e28ea1ae79060f80d9b4b57