Merge pull request #14578 from gitmai/bug-948824-CC-remove-icchelper

Bug 948824 - [CostControl] [DSDS] Remove IccHelper
r=salva
(cherry picked from commit 33e4a0f4e242b54c91eb8a1f5f91efada5252565)