Fix grouper build

Change-Id: I759799c386eddaf18d79b8f79fa187171007fc13