Merge "Testrunner: Fix output message" am: 06a0d47e46 am: 07e711f701
am: f660eef838

Change-Id: Ic5bbd2d3768b71d6dc6a88fa222dc656cab0f78d