Merge "Revert "test: Remove icu cleanup hack""