Don't query the agent with name

Bug #1160332

Change-Id: I4da1df900ff29f75e11b91186200d7841602bff4
Merge "Don't query the agent with name"