So that we have a more restricted enviornment for this new configuration axis that can also be imported into other tools more easily. Test: Manually Change-Id: Iabce1919f6d6f57a256ae144784af7c47622b54d