Merge "Use flavors for resources in oof csmo deployment"