Bug 928069: Fix more ftu tests to use correct mock_icc_helper.
Merge pull request #12944 from wanderview/ftu-mock-icc-2

Bug 928069: Fix more ftu tests to use correct mock_icc_helper. r=fcampo