Merge "Partially revert expected output for 911-get-stack-trace"
am: 311858cfed

Change-Id: Ie4dc9912c06f0023b63a15e72bed36cb6bc3d3cc