Variability: decouple wrapper layer from UI+fix in interpreter

Change-Id: I8eeeddb1912d6bccb7c588c8f31f4535a7bab229
13 files changed