Pull icc-cleanup into release branch

No match.