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

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