Merge "Do not define superfluous wpa_supplicant service"