Address wpa_supplicant vulnerabilities am: 7899587b4b am: 31f148388f

Change-Id: I58c3503bf60556853233f9c8f6f85cbac9c7c5aa