Merge "Inject different User IDs into biometric utils" into tm-dev