Merge "Fingerprint: call onRemovalSucceeded with # of remaining templates." into oc-dev