Merge "Change to ensure network type is selected correctly." into mnc-dr-dev