Fix stack-walking race
am: 721e402837

Change-Id: I48140914a15d664d2f1f9f1f04329e6ee5b66a6a