Merge "[DO NOT MERGE] Fix biometric test flaky" into udc-dev