Fixes role management screens

Closes-Bug: #1259518

Change-Id: I3439cdf24f6ed370df62e581baa1f488a28427d3
Merge "Fixes role management screens"