Merge "Updated Fingerprint enrollment logging"