Part 2 - NetworkManager & MmsService changes