Merge "Add @FlakyTest annotation to LegacyProviderMigrationTest"