Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev