Extra changes on Flavor Config

No match.