Merge "Enable ignored high perf lock unit tests" into udc-dev