Merge "Remove duplicate flaky test."