Merge "Testrunner: Take default only when no other variant is selected"
am: a01769f810

Change-Id: Ic1c5abcaac29171cc64a439d86199e53b2ea7d78