Merge "Fixing permanent lockout output for FingerprintService."