Merge "Generate better test failure output."
am: 111153ebce

Change-Id: I41de453d8e10d7b9d3fab4784976bb216f4d4c9d