Then variant handling is reworked to make the code simpler when
more variants are added.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>