agent should not be nice

Change-Id: I7dbdaa62904cd95bf91fbadd37ffc3bbcbdf7317
Merge "agent should not be nice"