Merge "Fix flaky unit test"