Merge "Remove full stack-trace printing from test 1928"