Merge "Reformat biometric auth constants to 4 hex digits"