Merge "fix test_flavors_extra_specs failure"