Merge "Remodel Network Selection" into mm-wireless-dev