Change role loading to explicitly list roles

This change comes after the previous approach caused issues for element
creation.

Change-Id: Ieaa9acb03cd9b00ba61eb05594b04456cf3683c3
Merge "Change role loading to explicitly list roles"