Merge "Don't throw RuntimeException on supplicant start/stop failure"