Add flavor in wizard

Change-Id: I77c433a4e7bc0b1ed5077f59439d39750f6ed865