Move role registrations to KommaModule.

Change-Id: I5e6101b929aca0d25ffb77d4e3a986e1a2adf307