Merge changes I599dbcd3,I7f3b023a

* changes:
  7/n: Fix templating for biometric utils
  6/n: Add RemovalClient for IFingerprint