More hybrid stuff for d2 and grouper

Change-Id: I8bdb53777069003f440ed2397d424632d655a151