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

Change-Id: I20579d11fcc109cc92d10a32afb31f70ad361df8