Merge "Remove the unused _get_unused_flavor_id()"