Merge "Fix intermittent test failure"