grouper: update from JDQ39

Change-Id: I64678aa94672d2e04d3b735d5326e437ce1cc55e