Merge "Add check after unset_flavor_extra_spec"