Merge "Update Biometric TestApis"