Fix role assign bug on filterd servers

Change-Id: Ife55b7311c4e54f4ec11c43b11b51e1f1a57ab93
Merge "Fix role assign bug on filterd servers"