bug 928861 - Part 2 - NetworkManager & MmsService changes, r=gene