Merge "Adding extra_specs to flavor format"