Adapt to the move of GroupDescription to entities package

Change-Id: Ibe9e517345b384397067d20d49cff36bb844a8bc
2 files changed