Merge "WiFi: Remove deprecated methods"