Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev