Merge "Replace GroupingResolver with AugmentationGroupingResolver"