grouper: custom -> omni

Change-Id: Ie42446c13c3c213ce55eadcd7973d5828bada1f2