Merge "Revert "Revert "Add ALTECOM and FIBRACAT MVNO settings"""