Merge "Add biometric2 unit test owner"