grouper: update from KOT49H

Change-Id: Ib19782f5892a532fcba8f1db4c10995fd0063ffc