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

Change-Id: I7d53b16147d5809e49f8a7f04b124355f266b984