Merge "Clean up fingerprint enrollment API" into nyc-dev