Merge "Fix biometrics bug of mismatched data types."