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

Change-Id: I598f73baa7ce2cbd841a704a92b6426a241b828e