Merge "Remove full stack-trace printing from test 1928"
am: 71f6acb7e6

Change-Id: Ib1da9efc6d442a892de41e05dae228ccd5a8930e