Adapt to AccountGroup.NameKey refactoring

Change-Id: I022529da581781061fd423db00200c8a3cbaeaa5
2 files changed