Merge "[wpa_supplicant] Cumulative patch from commit e4eb009d9" into rvc-dev am: 1337a99542 am: 2f71ce21b7 am: d6d2d5fd1d

Change-Id: I99bd86a2d2f047582629f64170e3e9da897acd54