Merge "Remove ConfigUtil.groupsFor() methods."