Merge "test: Remove icu cleanup hack"