Merge "Support Manual Network Selection Config"