Merge "Followup for grouping imports"