Merge "Keep failing tests' infomation without --verbose as well" am: 921efd290d
am: 29d4dca378

Change-Id: Id834e75a2311b2569edd85938d350b1e9800770a