Merge "Purge biometric weak from internal code"