Merge "fix flaky behavior in FakeLatencyTracker" into udc-dev