Merge "Testrunner: Refactor to remove duplication of variant types"
am: b2c45f802c

Change-Id: Ic8a0b9f734d75b19ac9150b77edb60ea1322e5c1