Merge "Revert "Revert "Add ALTECOM and FIBRACAT MVNO settings""" am: 31e11c6635
am: d36f164f0c

Change-Id: I4eb40b1de24ee00324892e554f445c3d28352a82