Merge "Fingerprint: call onRemovalSucceeded with # of remaining templates." into oc-dev am: 50be382341
am: 16a2759492

Change-Id: I0caf8f5367fe611ddacb6132ea5f0baac8ad75e6