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

Change-Id: Icf83193f802c476b1d6f95bc3b65851a6cf3323f