Merge "Testrunner: Fix output parsing issue" am: cd29b3b2b2
am: 6f1bf60243

Change-Id: I3934b35267b7fa213b71412e85e8d2c9c22b8095