Merge "WifiManager: add call to see if apband conversion is required" into pi-dev