Merge changes I070a5416,I82d7ceac,I3f7695ef

* changes:
  11/n: Finish remainder of IFingerprint implementation
  10/n: Add remainder of functionality to FingerprintProvider
  9/n: Fix more biometric templating