Merge "Revert "wifi_files: retain data longer and add tests.""