Track proper grouper kernel branch

Change-Id: Ib4c892ccda87e61aa123dd78123263d7a40fcbf9