Merge "Revert "Split out new RefreshSecondaryDataUpdate class""