Bug 917740 - Update file format of customization files based on MCC/MNC
Tests & review comments addressed.