Merge "Revert "Add option to allow key validity after fingerprint enrollment."" into nyc-dev