Merge "Fingerprint: Unify enumerate() and remove() messaging."