Merge "Remove the @FlakyTest annotation from no longer flaky test"