Make fieldcount agent handle duplicates am: 26dbdcf691
am: 8521ca922c

Change-Id: I5e44df4f2bc1b7349f88cd9848d41ecbae58dcc2