Merge pull request #9245 from jaoo/860411

Bug 860411 - Roaming Broker or Double IMSI SIM card, r=kaze(cherry picked from commit 08f2547c34b02fb7920efc4e31e22023ce638873)