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

Change-Id: I064ee86b42384a6f52a50ecdefb78b016eee9c96