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

Change-Id: I8ee135aa0b7871abcfccdd1b4d5dfc4aac1ba35e