allow agents to be in multiple queue

Change-Id: I80fd3293325a9b14cf3b46268751ec28872f3008
Closes-Bug: #1255663