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

Change-Id: I61f07729b336a414f9dbee0bf3e1147c99d89b4a