Merge "Fix StackWalk test."