Adapt to the move of GroupDescription to entities package Change-Id: Ief3c183431b98e7f112984c3ee94d7f3200188f1