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

Change-Id: I9406587fee388440c17054a2194dc0fd3a70bd2f