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

Change-Id: I1beb1e196c610f124bb2c68b3ac89b246c6225eb