Merge "Move unset_flavor_extra_specs to extra specs file"