Merge "Remove combined_apis_defaults module type" into main