OWD 29976.  Handle the right number of digits of MCC/MNC in all cases
Merge pull request #281 from willyaranda/jira/29976

OWD 29976.  Handle the right number of digits of MCC/MNC in all cases