Merge "Update test expectations for 911-get-stack-trace." am: 728ca71cc4
am: ca4e526057

Change-Id: I6c8f3ba5a1e9be85cf52dde87412e4921ca9444a