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

Change-Id: If0ed4939c564b9becfe3d95426a90920ce88fcd8