Fix stack traces

Change-Id: I30766199ab157a0f6168d666a32261b1758807ae
Merge "Fix stack traces"