Merge "Revert "Disable flaky test on host.""