Merge "Update mandatory biometrics string" into main