Merge "Add default_teams to ChoreographerTests build target" into main