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

Change-Id: I71939292a612b8046aa139b55563bdc5a724d9f3