Merge "Fix race condition for test_flavors_extra_specs"