Merge "Implement enumerate in FingerprintService" into oc-dev
am: c2f8949b32

Change-Id: Iae38c3a036374d5556f1020cd3fd472b5e7c819f