Merge "Fix BiometricService TAG"