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

Change-Id: Iae8e778d5e6e9b818d65e716aef991cb6e0c8fe9