Changed role count assignment to use role name

Change-Id: I403285fc58fa0d2f0dcfc075e4cfca9e85dfece6
Closes-Bug: #1281051