Merge "Testrunner: Accept test_name by run-test number" am: 0527a22f0f
am: 9177737e29

Change-Id: Ie736a08599b403df90a84deb955e446a5e830d7c