make sure snapshots have common role class

Change-Id: I282053bd4b8694f0da896c66935a1907ef76b7c5