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

Change-Id: Id837e7ca7651c6477521540e8c059adebb4fdc1b