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

* commit 'cf3fc1a3a1f56ee8bfef9d93694b314ab081f525':
  Change to ensure network type is selected correctly.