Make fieldcount agent handle duplicates
am: 26dbdcf691

Change-Id: Id5833410c9ab2bb97a54d291376f6ceaf2a85814