Merge "Remodel Network Selection" into mm-wireless-dev
am: 2fdee90b68

* commit '2fdee90b685781ec5e30f0788b727f692df32d40':
  Remodel Network Selection