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

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