Merge "Testrunner: Refactor to remove duplication of variant types" am: b2c45f80 am: 6ff5a0be am: 8a08142c am: bc5da90c Change-Id: I7759b989a82b455a41871dbdf2b56700106ee99f