Merge "Move biometrics into biometric namespace"