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

Change-Id: I0b8e92b59ed0d7880cb5550efc055a7e5a6ad80c