Merge "Fix the test_list_enabled_api_versions"