Merge pull request #14214 from crh0716/944230

Bug 944230 - Remove the use of IccHelper r=rik