Merge "Revert "finished implementation of fingerprintservice enumerate"" into oc-dev