Bug 864798 - Follow up of bug 845629 about updating MNC and MCC uses