Merge "Partially revert expected output for 911-get-stack-trace"