snapshot common role gets account related classes

Change-Id: Ibdbed28072f28104512d1b761403ab84464e4a32