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

Change-Id: I998196c66fc3f153efe877b67e97a040b6b3d3cd